spree_api 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3d7994fdc3ab159cb6c5c25c3df0328bdb7d09
-  data.tar.gz: 8ed983dd2706eacfa4081f2cb2509685f1e4e565
+  metadata.gz: 5752a91942e0ac29588a3ebb480984ae1e8a4833
+  data.tar.gz: f7a88ac18005ccce8cb89b0e95201174e39404e0
 SHA512:
-  metadata.gz: fd18911bd56574872239ba21ed83030ec250bfaf3d339b05be20d7195bf4a03f27f3fa915b947e09284d01514445e81ae07ef5ef765e5cce971ee8ac69452175
-  data.tar.gz: b82a4694d499d371a463583ae30a7b414576cfca8b0430610b2c4191f42f823341c70cdf4f291a4fe856e46c18778d5a71ac69b7eff0058dd6247b4b9f0eaba8
+  metadata.gz: fe932da355fa5f4289aef12236e5054ea5489152e82d0e9bf1c22d8343c1d96891da9d132477fd6eece63df8f019f5656eeca7e49a825bb5046563a7fe85773a
+  data.tar.gz: 3e6d70b9faa3d422a88f7b30aadc53bffebfc9754121c39cab70ade338e6c81adb3641c00b4fb5fcea70e329db558f20c5e4f2a1f7a4d836648688ac4cdd0798

data/app/controllers/spree/api/addresses_controller.rb

@@ -4,12 +4,14 @@ module Spree
       before_filter :find_order
 
       def show
-        load_and_authorize_address(:read)
+        authorize! :read, @order, order_token
+        find_address
         respond_with(@address)
       end
 
       def update
-        load_and_authorize_address(:update)
+        authorize! :update, @order, order_token
+        find_address
 
         if @address.update_attributes(address_params)
           respond_with(@address, :default_template => :show)
@@ -24,29 +26,16 @@ module Spree
         end
 
         def find_order
-          @order = Spree::Order.find_by!(number: order_id) if order_id
+          @order = Spree::Order.find_by!(number: order_id)
         end
 
         def find_address
-          if @order
-            @address = if @order.bill_address_id == params[:id].to_i
-              @order.bill_address
-            elsif @order.ship_address_id == params[:id].to_i
-              @order.ship_address
-            else
-              raise CanCan::AccessDenied
-            end
+          @address = if @order.bill_address_id == params[:id].to_i
+            @order.bill_address
+          elsif @order.ship_address_id == params[:id].to_i
+            @order.ship_address
           else
-            @address = Spree::Address.find(params[:id])
-          end
-        end
-
-        def load_and_authorize_address(permission)
-          find_address
-          if @order
-            authorize! permission, @order, order_token
-          else
-            authorize! permission, @address
+            raise CanCan::AccessDenied
           end
         end
     end

data/spec/controllers/spree/api/addresses_controller_spec.rb

@@ -7,76 +7,50 @@ module Spree
     before do
       stub_authentication!
       @address = create(:address)
+      @order = create(:order, :bill_address => @address)
     end
-    
-    context "with order" do
+
+    context "with their own address" do
       before do
-        @order = create(:order, :bill_address => @address)
+        Order.any_instance.stub :user => current_api_user
       end
-      
-      context "with their own address" do
-        before do
-          Order.any_instance.stub :user => current_api_user
-        end
-
-        it "gets an address" do
-          api_get :show, :id => @address.id, :order_id => @order.number
-          json_response['address1'].should eq @address.address1
-        end
-
-        it "updates an address" do
-          api_put :update, :id => @address.id, :order_id => @order.number,
-                           :address => { :address1 => "123 Test Lane" }
-          json_response['address1'].should eq '123 Test Lane'
-        end
-
-        it "receives the errors object if address is invalid" do
-          api_put :update, :id => @address.id, :order_id => @order.number,
-                           :address => { :address1 => "" }
 
-          json_response['error'].should_not be_nil
-          json_response['errors'].should_not be_nil
-          json_response['errors']['address1'].first.should eq "can't be blank"
-        end
+      it "gets an address" do
+        api_get :show, :id => @address.id, :order_id => @order.number
+        json_response['address1'].should eq @address.address1
       end
 
-      context "on an address that does not belong to this order" do
-        before do
-          @order.bill_address_id = nil
-          @order.ship_address = nil
-        end
+      it "updates an address" do
+        api_put :update, :id => @address.id, :order_id => @order.number,
+                         :address => { :address1 => "123 Test Lane" }
+        json_response['address1'].should eq '123 Test Lane'
+      end
 
-        it "cannot retreive address information" do
-          api_get :show, :id => @address.id, :order_id => @order.number
-          assert_unauthorized!
-        end
+      it "receives the errors object if address is invalid" do
+        api_put :update, :id => @address.id, :order_id => @order.number,
+                         :address => { :address1 => "" }
 
-        it "cannot update address information" do
-          api_get :update, :id => @address.id, :order_id => @order.number
-          assert_unauthorized!
-        end
+        json_response['error'].should_not be_nil
+        json_response['errors'].should_not be_nil
+        json_response['errors']['address1'].first.should eq "can't be blank"
       end
     end
-    
-    context "without order" do
-      context "with their own address" do
-        before do
-          Address.any_instance.stub :user => current_api_user
-        end
 
-        it "gets an address" do
-          api_get :show, :id => @address.id
-          json_response['address1'].should eq @address.address1
-        end
+    context "on an address that does not belong to this order" do
+      before do
+        @order.bill_address_id = nil
+        @order.ship_address = nil
+      end
+
+      it "cannot retreive address information" do
+        api_get :show, :id => @address.id, :order_id => @order.number
+        assert_unauthorized!
       end
 
-      context "on an address that does not belong to this user" do
-        it "cannot update address information" do
-          api_put :update, :id => @address.id, :address => { :address1 => "123 Test Lane" }
-          json_response['address1'].should be_nil
-          assert_unauthorized!
-        end
+      it "cannot update address information" do
+        api_get :update, :id => @address.id, :order_id => @order.number
+        assert_unauthorized!
       end
     end
   end
-end
+end

data/spec/controllers/spree/api/base_controller_spec.rb

@@ -81,8 +81,8 @@ describe Spree::Api::BaseController do
                    'name' => 'test order' }
 
     mapped = subject.map_nested_attributes_keys(klass, attributes)
-    mapped.has_key?('line_items_attributes').should be_true
-    mapped.has_key?('name').should be_true
+    mapped.has_key?('line_items_attributes').should be true
+    mapped.has_key?('name').should be true
   end
 
   it "lets a subclass override the product associations that are eager-loaded" do

data/spec/controllers/spree/api/checkouts_controller_spec.rb

@@ -67,7 +67,7 @@ module Spree
       end
 
       it "will return an error if the order cannot transition" do
-        pending "not sure if this test is valid"
+        skip "not sure if this test is valid"
         order.bill_address = nil
         order.save
         order.update_column(:state, "address")
@@ -135,7 +135,7 @@ module Spree
         # Find the correct shipping rate for that shipment...
         json_shipping_rate = json_shipment['shipping_rates'].detect { |sr| sr["id"] == shipping_rate.id }
         # ... And finally ensure that it's selected
-        json_shipping_rate['selected'].should be_true
+        json_shipping_rate['selected'].should be true
         # Order should automatically transfer to payment because all criteria are met
         json_response['state'].should == 'payment'
       end
@@ -240,7 +240,7 @@ module Spree
       end
 
       it "can apply a coupon code to an order" do
-        pending "ensure that the order totals are properly updated, see frontend orders_controller or checkout_controller as example"
+        skip "ensure that the order totals are properly updated, see frontend orders_controller or checkout_controller as example"
 
         order.update_column(:state, "payment")
         PromotionHandler::Coupon.should_receive(:new).with(order).and_call_original

data/spec/controllers/spree/api/orders_controller_spec.rb

@@ -460,10 +460,10 @@ module Spree
           end
 
           it "includes the ship_total in the response" do
-            api_get :show, :id => order.to_param
+            api_get :show, id: order.to_param
 
-            json_response['ship_total'].should == '0.0'
-            json_response['display_ship_total'].should == '$0.00'
+            expect(json_response['ship_total']).to eq '10.0'
+            expect(json_response['display_ship_total']).to eq '$10.00'
           end
 
           it "returns available shipments for an order" do
@@ -486,7 +486,7 @@ module Spree
             shipping_rate = shipment["shipping_rates"][0]
             shipping_rate["name"].should == json_shipping_method["name"]
             shipping_rate["cost"].should == "10.0"
-            shipping_rate["selected"].should be_true
+            shipping_rate["selected"].should be true
             shipping_rate["display_cost"].should == "$10.00"
 
             shipment["stock_location_name"].should_not be_blank
@@ -511,9 +511,9 @@ module Spree
 
       it "responds with orders updated_at with miliseconds precision" do
         if ActiveRecord::Base.connection.adapter_name == "Mysql2"
-          pending "MySQL does not support millisecond timestamps."
+          skip "MySQL does not support millisecond timestamps."
         else
-          pending "Probable need to make it call as_json. See https://github.com/rails/rails/commit/0f33d70e89991711ff8b3dde134a61f4a5a0ec06"
+          skip "Probable need to make it call as_json. See https://github.com/rails/rails/commit/0f33d70e89991711ff8b3dde134a61f4a5a0ec06"
         end
 
         api_get :index

data/spec/controllers/spree/api/payments_controller_spec.rb

@@ -145,7 +145,7 @@ module Spree
             end
 
             it "does not raise a stack level error" do
-              pending "Investigate why a payment.reload after the request raises 'stack level too deep'"
+              skip "Investigate why a payment.reload after the request raises 'stack level too deep'"
               payment.reload.state.should == "failed"
             end
           end

data/spec/controllers/spree/api/promotion_application_spec.rb

@@ -10,7 +10,7 @@ module Spree::Api
 
     context "with an available promotion" do
       let!(:order) { create(:order_with_line_items, :line_items_count => 1) }
-      let!(:promotion) do 
+      let!(:promotion) do
         promotion = Spree::Promotion.create(name: "10% off", code: "10off")
         calculator = Spree::Calculator::FlatPercentItemTotal.create(preferred_flat_percent: "10")
         action = Spree::Promotion::Actions::CreateItemAdjustments.create(calculator: calculator)
@@ -25,7 +25,7 @@ module Spree::Api
         order.reload.total.should == 109.00
         json_response["success"].should == "The coupon code was successfully applied to your order."
         json_response["error"].should be_blank
-        json_response["successful"].should be_true
+        json_response["successful"].should be true
       end
 
       context "with an expired promotion" do
@@ -40,7 +40,7 @@ module Spree::Api
           response.status.should == 422
           json_response["success"].should be_blank
           json_response["error"].should == "The coupon code is expired"
-          json_response["successful"].should be_false
+          json_response["successful"].should be false
         end
       end
     end

data/spec/controllers/spree/api/taxonomies_controller_spec.rb

@@ -47,7 +47,7 @@ module Spree
         children = json_response['root']['taxons']
         children.count.should eq 1
         children.first['name'].should eq taxon.name
-        children.first.key?('taxons').should be_false
+        children.first.key?('taxons').should be false
       end
 
       it "gets a single taxonomy with set=nested" do
@@ -56,7 +56,7 @@ module Spree
         json_response['name'].should eq taxonomy.name
 
         children = json_response['root']['taxons']
-        children.first.key?('taxons').should be_true
+        children.first.key?('taxons').should be true
       end
 
       it "gets the jstree-friendly version of a taxonomy" do

data/spec/requests/rabl_cache_spec.rb

@@ -18,13 +18,13 @@ describe "Rabl Cache", :caching => true do
       !v['is_master']
     end.first
 
-    variant_a['is_master'].should be_false
+    variant_a['is_master'].should be false
     variant_a['stock_items'].should_not be_nil
 
     get "/api/products/#{Spree::Product.first.id}", :token => user.spree_api_key
     response.status.should == 200
     variant_b = JSON.parse(response.body)['variants'].last
-    variant_b['is_master'].should be_false
+    variant_b['is_master'].should be false
 
     variant_a['id'].should == variant_b['id']
     variant_b['stock_items'].should be_nil

data/spec/spec_helper.rb

@@ -39,6 +39,7 @@ require 'spree/api/testing_support/setup'
 RSpec.configure do |config|
   config.backtrace_exclusion_patterns = [/gems\/activesupport/, /gems\/actionpack/, /gems\/rspec/]
   config.color = true
+  config.infer_spec_type_from_file_location!
 
   config.include FactoryGirl::Syntax::Methods
   config.include Spree::Api::TestingSupport::Helpers, :type => :controller

data/spec/support/controller_hacks.rb

@@ -23,5 +23,5 @@ module ControllerHacks
 end
 
 RSpec.configure do |config|
-  config.include ControllerHacks, :type => :controller
+  config.include ControllerHacks, type: :controller
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-29 00:00:00.000000000 Z
+date: 2014-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement