spree_api 2.3.10 → 2.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22e6d6368a0b553bae43005f73d2d28c9fe0af71
-  data.tar.gz: 2ca37e342f06bb3ebae960483d1772ec6ca53d38
+  metadata.gz: ed0a530c08a01e75e353b91d68dffab34f9b8b6f
+  data.tar.gz: 406c9153f3dba06a9e2f3a726d554af79cb7896a
 SHA512:
-  metadata.gz: bd7fd7f4eb054222112e8c9b9505a5b216e6688d44e897b56958c00aaca830cbba72769b27483c390319f645742e1a1807489f67f7be500be46f5f4a048a2322
-  data.tar.gz: dbcf2f5d1f0086ba98f0100ad730541d1bc8016fc691c03c67ce5de940650f8cf0d92f209d2aabe714f6882ab2ffe957c12f8c76b42b0c55941d05d102b01f5c
+  metadata.gz: 0f6627eb12601b97b6634fc974b2b219a73c2436561c2a51f50ca412636df492866eb482706c542146d7dc1fbc6d9e1a56cd8355dc479165d1168170fb04bc05
+  data.tar.gz: db2c6d8019058c36930f5e774fb8017ba082e27990f9f4095f8ef5065714f00800c02d475dd7a6852b625b19805238009f31bad23bc4b1e69cb287c9c81370fa

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

@@ -26,7 +26,7 @@ module Spree
 
       def update
         authorize! params[:action], @payment
-        if ! @payment.pending?
+        if !@payment.editable?
           render 'update_forbidden', status: 403
         elsif @payment.update_attributes(payment_params)
           respond_with(@payment, default_template: :show)

data/lib/spree/api/responders/rabl_template.rb

@@ -14,7 +14,7 @@ module Spree
         end
 
         def template
-          request.headers['X-Spree-Template'] || controller.params[:template] || options[:default_template]
+          options[:default_template]
         end
 
         def api_behavior(error)

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

@@ -105,26 +105,37 @@ module Spree
 
       context "for a given payment" do
         context "updating" do
-          it "can update" do
-            payment.update_attributes(:state => 'pending')
-            api_put :update, :id => payment.to_param, :payment => { :amount => 2.01 }
-            expect(response.status).to eq(200)
-            expect(payment.reload.amount).to eq(2.01)
+          context "when the state is checkout" do
+            it "can update" do
+              payment.update_attributes(state: 'checkout')
+              api_put(:update, id: payment.to_param, payment: { amount: 2.01 })
+              expect(response.status).to be(200)
+              expect(payment.reload.amount).to eq(2.01)
+            end
+          end
+
+          context "when the state is pending" do
+            it "can update" do
+              payment.update_attributes(state: 'pending')
+              api_put(:update, id: payment.to_param, payment: { amount: 2.01 })
+              expect(response.status).to be(200)
+              expect(payment.reload.amount).to eq(2.01)
+            end
           end
 
           context "update fails" do
             it "returns a 422 status when the amount is invalid" do
-              payment.update_attributes(:state => 'pending')
-              api_put :update, :id => payment.to_param, :payment => { :amount => 'invalid' }
-              expect(response.status).to eq(422)
-              expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
+              payment.update_attributes(state: 'pending')
+              api_put(:update, id: payment.to_param, payment: { amount: 'invalid' })
+              expect(response.status).to be(422)
+              expect(json_response['error']).to eql('Invalid resource. Please fix errors and try again.')
             end
 
             it "returns a 403 status when the payment is not pending" do
-              payment.update_attributes(:state => 'completed')
-              api_put :update, :id => payment.to_param, :payment => { :amount => 2.01 }
-              expect(response.status).to eq(403)
-              expect(json_response["error"]).to eq("This payment cannot be updated because it is completed.")
+              payment.update_attributes(state: 'completed')
+              api_put(:update, id: payment.to_param, payment: { amount: 2.01 })
+              expect(response.status).to be(403)
+              expect(json_response['error']).to eql('This payment cannot be updated because it is completed.')
             end
           end
         end

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

@@ -67,34 +67,6 @@ module Spree
         expect(json_response["per_page"]).to eq(Kaminari.config.default_per_page)
       end
 
-      context "specifying a rabl template for a custom action" do
-        before do
-          Spree::Api::ProductsController.class_eval do
-            def custom_show
-              @product = find_product(params[:id])
-              respond_with(@product)
-            end
-          end
-        end
-
-        it "uses the specified custom template through the request header" do
-          request.headers['X-Spree-Template'] = 'show'
-          api_get :custom_show, :id => product.id
-          expect(response).to render_template('spree/api/products/show')
-        end
-
-        it "uses the specified custom template through the template URL parameter" do
-          api_get :custom_show, :id => product.id, :template => 'show'
-          expect(response).to render_template('spree/api/products/show')
-        end
-
-        it "falls back to the default template if the specified template does not exist" do
-          request.headers['X-Spree-Template'] = 'invoice'
-          api_get :show, :id => product.id
-          expect(response).to render_template('spree/api/products/show')
-        end
-      end
-
       context "product has more than one price" do
         before { product.master.prices.create currency: "EUR", amount: 22 }
 

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

@@ -38,28 +38,6 @@ module Spree
       expect(json_response['zone_members'].size).to eq @zone.zone_members.count
     end
 
-    context "specifying a rabl template to use" do
-      before do
-        Spree::Api::ZonesController.class_eval do
-          def custom_show
-            respond_with(zone)
-          end
-        end
-      end
-
-      it "uses the specified template" do
-        request.headers['X-Spree-Template'] = 'show'
-        api_get :custom_show, :id => @zone.id
-        expect(response).to render_template('spree/api/zones/show')
-      end
-
-      it "falls back to the default template if the specified template does not exist" do
-        request.headers['X-Spree-Template'] = 'invoice'
-        api_get :show, :id => @zone.id
-        expect(response).to render_template('spree/api/zones/show')
-      end
-    end
-
     context "as an admin" do
       sign_in_as_admin!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.3.10
+  version: 2.3.11
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-07-20 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.10
+        version: 2.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.10
+        version: 2.3.11
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement