solidus_frontend 2.8.5 → 2.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b75b544ebf36366adca46c44097e0a15cbbc2f6d8cc9c3811eb1d13b9bed07d
-  data.tar.gz: 349441f0d73dad2bae1df2798aceec3837faf4b1efae2c9fd95af1da44868ce6
+  metadata.gz: 1daacac80ac7da26b638ae0c7a23783bea3e7f0ee82b3d7453b2c6ec8b2543e5
+  data.tar.gz: 93ec515cdff1099ac11b27fcd2c740891c31f3f6569d45868a32d0d3690776e6
 SHA512:
-  metadata.gz: f0e9c9b803b2737c96365c787205e2a7c334eaf3b720570b6db43507309aae7b366f6ffcb877a66c88940b0f4ed0aa741d43840a92ca56c0d09707b8674bd373
-  data.tar.gz: 8614ae22cf543067701888f440ab7e396fae0accf5d5af07ca58cf5eafa21ec25819167b6caf6333e92d50eee42bad9368405a4bfd8d74666a7800f620788044
+  metadata.gz: e7ae3f703517879888b4b079a10443471eebc752080901f7ce79d0e34efda6226ac966ba8103452adfb70f6a379684e44a6fffdd4e6bbe8ded2235d350260393
+  data.tar.gz: d7e3b788e0891df7ca97958055e5927b4e95e6739b5ce4e8f0f4b61e69c49570a156b9941cc41df2e49aa923b5921daa6dee1696ad090ed5805676913c5213e9

data/app/controllers/spree/checkout_controller.rb

@@ -17,7 +17,7 @@ module Spree
 
     before_action :associate_user
     before_action :check_authorization
-    before_action :apply_coupon_code
+    before_action :apply_coupon_code, only: [:update]
 
     before_action :setup_for_current_state, only: [:edit, :update]
 
@@ -87,11 +87,23 @@ module Spree
     end
 
     def update_params
-      if update_params = massaged_params[:order]
-        update_params.permit(permitted_checkout_attributes)
+      case params[:state].to_sym
+      when :address
+        massaged_params.require(:order).permit(
+          permitted_checkout_address_attributes
+        )
+      when :delivery
+        massaged_params.require(:order).permit(
+          permitted_checkout_delivery_attributes
+        )
+      when :payment
+        massaged_params.require(:order).permit(
+          permitted_checkout_payment_attributes
+        )
       else
-        # We currently allow update requests without any parameters in them.
-        {}
+        massaged_params.fetch(:order, {}).permit(
+          permitted_checkout_confirm_attributes
+        )
       end
     end
 

data/spec/controllers/spree/checkout_controller_spec.rb

@@ -68,7 +68,7 @@ describe Spree::CheckoutController, type: :controller do
     it 'should check if the user is authorized for :edit' do
       expect(controller).to receive(:authorize!).with(:edit, order, token)
       request.cookie_jar.signed[:guest_token] = token
-      post :update, params: { state: 'address' }
+      post :update, params: { state: 'address', order: { bill_address_attributes: address_params } }
     end
 
     context "save successful" do
@@ -96,7 +96,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "should assign order" do
-          post :update, params: { state: "address" }
+          post :update, params: { state: "address", order: { bill_address_attributes: address_params } }
           expect(assigns[:order]).not_to be_nil
         end
 
@@ -271,6 +271,31 @@ describe Spree::CheckoutController, type: :controller do
             expect(order.payments).to be_empty
           end
         end
+
+        context 'trying to change the address' do
+          let(:params) do
+            {
+              state: 'payment',
+              order: {
+                payments_attributes: [
+                  {
+                    payment_method_id: payment_method.id.to_s,
+                    source_attributes: attributes_for(:credit_card)
+                  }
+                ],
+                ship_address_attributes: {
+                  zipcode: 'TEST'
+                }
+              }
+            }
+          end
+
+          it 'does not change the address' do
+            expect do
+              post :update, params: params
+            end.not_to change { order.reload.ship_address.zipcode }
+          end
+        end
       end
 
       context "when in the confirm state" do
@@ -310,16 +335,18 @@ describe Spree::CheckoutController, type: :controller do
       end
 
       it "should not assign order" do
-        post :update, params: { state: "address", email: '' }
+        post :update, params: { state: "address", order: { email: ''}  }
         expect(assigns[:order]).not_to be_nil
       end
 
       it "should not change the order state" do
-        post :update, params: { state: 'address' }
+        expect do
+          post :update, params: { state: 'address', order: { bill_address_attributes: address_params } }
+        end.not_to change { order.reload.state }
       end
 
       it "should render the edit template" do
-        post :update, params: { state: 'address' }
+        post :update, params: { state: 'address', order: { bill_address_attributes: address_params } }
         expect(response).to render_template :edit
       end
     end
@@ -342,7 +369,7 @@ describe Spree::CheckoutController, type: :controller do
       before do
         order.update_attributes! user: user
         allow(order).to receive(:next).and_raise(Spree::Core::GatewayError.new("Invalid something or other."))
-        post :update, params: { state: "address" }
+        post :update, params: { state: "address", order: { bill_address_attributes: address_params } }
       end
 
       it "should render the edit template and display exception message" do
@@ -373,7 +400,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "due to the order having errors" do
-          put :update, params: { state: order.state, order: {} }
+          put :update, params: { state: order.state, order: { bill_address_attributes: address_params } }
           expect(flash[:error]).to eq("Base error\nAdjustments error")
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
@@ -387,7 +414,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "due to no available shipping rates for any of the shipments" do
-          put :update, params: { state: "address", order: {} }
+          put :update, params: { state: "address", order: { bill_address_attributes: address_params } }
           expect(flash[:error]).to eq(I18n.t('spree.items_cannot_be_shipped'))
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
@@ -437,7 +464,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "redirects the customer to the cart page with an error message" do
-          put :update, params: { state: order.state, order: {} }
+          put :update, params: { state: order.state, order: { bill_address_attributes: address_params } }
           expect(flash[:error]).to eq(I18n.t('spree.insufficient_stock_for_order'))
           expect(response).to redirect_to(spree.cart_path)
         end
@@ -496,9 +523,11 @@ describe Spree::CheckoutController, type: :controller do
       allow(controller).to receive_messages check_authorization: true
     end
 
-    it "doesn't set shipping address on the order" do
+    # This does not test whether the shipping address is set via params.
+    # It only tests whether it is set in the before action.
+    it "doesn't set a default shipping address on the order" do
       expect(order).to_not receive(:ship_address=)
-      post :update, params: { state: order.state }
+      post :update, params: { state: order.state, order: { bill_address_attributes: address_params } }
     end
 
     it "doesn't remove unshippable items before payment" do
@@ -513,7 +542,7 @@ describe Spree::CheckoutController, type: :controller do
     allow(controller).to receive_messages check_authorization: true
 
     expect {
-      post :update, params: { state: "payment" }
+      post :update, params: { state: "payment", order: { email: "johndoe@example.com"} }
     }.to change { order.line_items.to_a.size }.from(1).to(0)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.8.5
+  version: 2.8.6
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-23 00:00:00.000000000 Z
+date: 2020-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 2.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 2.8.6
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 2.8.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 2.8.6
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -332,7 +332,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.