solidus_frontend 2.9.6 → 2.10.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59a3b04e427501e6c465c89d3a7a5278be8b999ab29dbbe0af9841df1d1032c8
-  data.tar.gz: f62b17d100120614790bf81f0f0f202f1b55918489b242f8b89cb311406f96a2
+  metadata.gz: 310fa3a7c2ffb353cad6a3c0079333d95c073943e0abc47fab729f5540adc33d
+  data.tar.gz: 450b021d8e2016edcc7b0a0a219437077a41e9d0336cef670ddbf5ab1cdea3d6
 SHA512:
-  metadata.gz: 7385f7eb310a92fcb4eaf18b2fd377cf08ee0c863bd806724dd860ad70d99dceadb59807edf6dcd6b8d2608a12e1064f301c912664d44616c235f6ac79e6ec6e
-  data.tar.gz: dda5bfdd5c4c33f6bbdda2692d24a24ec0953686c4ebfec47137451fd830a7a36e884b1577fef5a24f03c0007f95401820c6118ac38e2ed6452215f449d22454
+  metadata.gz: dd6a633f4cb60280996525a0baf5dfeb26de2a8b6b09ccd8764b3ae875a6f7ed1ce9042de398fe71e55f86b5e5a8fb7eec451e830d04f907409227651eeb23fa
+  data.tar.gz: d58fb10140bcef216ae59b79ce1cb53237c7d8b19556dc5dc7cde72fa36d0bc7d37ad8815cc7b7c595145447f66f9d9cef5b0b6b23b8d3a84e39b71eb482f1b5

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, only: [:update]
+    before_action :apply_coupon_code
 
     before_action :setup_for_current_state, only: [:edit, :update]
 
@@ -87,23 +87,11 @@ module Spree
     end
 
     def update_params
-      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
-        )
+      if update_params = massaged_params[:order]
+        update_params.permit(permitted_checkout_attributes)
       else
-        massaged_params.fetch(:order, {}).permit(
-          permitted_checkout_confirm_attributes
-        )
+        # We currently allow update requests without any parameters in them.
+        {}
       end
     end
 

data/lib/spree/frontend/config.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+require 'spree/frontend_configuration'
+
+module Spree
+  module Frontend
+    Config = Spree::FrontendConfiguration.new
+  end
+end

data/lib/spree/frontend/engine.rb

@@ -1,13 +1,15 @@
 # frozen_string_literal: true
 
+require 'spree/frontend/config'
+
 module Spree
   module Frontend
     class Engine < ::Rails::Engine
       config.middleware.use "Spree::Frontend::Middleware::SeoAssist"
 
-      initializer "spree.frontend.environment", before: :load_config_initializers do |_app|
-        Spree::Frontend::Config = Spree::FrontendConfiguration.new
-      end
+      # Leave initializer empty for backwards-compatability. Other apps
+      # might still rely on this event.
+      initializer "spree.frontend.environment", before: :load_config_initializers do; end
     end
   end
 end

data/{app/models → lib}/spree/frontend_configuration.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class FrontendConfiguration < Preferences::Configuration
-    preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :locale, :string, default: I18n.default_locale
 
     # Add your terms and conditions in app/views/spree/checkout/_terms_and_conditions.en.html.erb
     preference :require_terms_and_conditions_acceptance, :boolean, default: false

data/solidus_frontend.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'kaminari', '~> 1.1'
+  s.add_dependency 'responders'
   s.add_dependency 'sassc-rails'
   s.add_dependency 'truncate_html', '~> 0.9', '>= 0.9.2'
 

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', order: { bill_address_attributes: address_params } }
+      post :update, params: { state: 'address' }
     end
 
     context "save successful" do
@@ -91,12 +91,12 @@ describe Spree::CheckoutController, type: :controller do
 
       context "with the order in the cart state", partial_double_verification: false do
         before do
-          order.update_attributes! user: user
+          order.update! user: user
           order.update_column(:state, "cart")
         end
 
         it "should assign order" do
-          post :update, params: { state: "address", order: { bill_address_attributes: address_params } }
+          post :update, params: { state: "address" }
           expect(assigns[:order]).not_to be_nil
         end
 
@@ -140,7 +140,7 @@ describe Spree::CheckoutController, type: :controller do
 
       context "with the order in the address state", partial_double_verification: false do
         before do
-          order.update_attributes! user: user
+          order.update! user: user
           order.update_columns(ship_address_id: create(:address).id, state: "address")
         end
 
@@ -213,7 +213,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         before do
-          order.update_attributes! user: user
+          order.update! user: user
           3.times { order.next! } # should put us in the payment state
         end
 
@@ -245,7 +245,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         before do
-          order.update_attributes! user: user
+          order.update! user: user
           3.times { order.next! } # should put us in the payment state
         end
 
@@ -271,36 +271,11 @@ 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
         before do
-          order.update_attributes! user: user
+          order.update! user: user
           order.update_column(:state, "confirm")
           # An order requires a payment to reach the complete state
           # This is because payment_required? is true on the order
@@ -330,23 +305,21 @@ describe Spree::CheckoutController, type: :controller do
 
     context "save unsuccessful" do
       before do
-        order.update_attributes! user: user
+        order.update! user: user
         allow(order).to receive_messages valid?: false
       end
 
       it "should not assign order" do
-        post :update, params: { state: "address", order: { email: ''}  }
+        post :update, params: { state: "address", email: '' }
         expect(assigns[:order]).not_to be_nil
       end
 
       it "should not change the order state" do
-        expect do
-          post :update, params: { state: 'address', order: { bill_address_attributes: address_params } }
-        end.not_to change { order.reload.state }
+        post :update, params: { state: 'address' }
       end
 
       it "should render the edit template" do
-        post :update, params: { state: 'address', order: { bill_address_attributes: address_params } }
+        post :update, params: { state: 'address' }
         expect(response).to render_template :edit
       end
     end
@@ -367,9 +340,9 @@ describe Spree::CheckoutController, type: :controller do
 
     context "Spree::Core::GatewayError" do
       before do
-        order.update_attributes! user: user
+        order.update! user: user
         allow(order).to receive(:next).and_raise(Spree::Core::GatewayError.new("Invalid something or other."))
-        post :update, params: { state: "address", order: { bill_address_attributes: address_params } }
+        post :update, params: { state: "address" }
       end
 
       it "should render the edit template and display exception message" do
@@ -400,7 +373,7 @@ describe Spree::CheckoutController, type: :controller do
         end
 
         it "due to the order having errors" do
-          put :update, params: { state: order.state, order: { bill_address_attributes: address_params } }
+          put :update, params: { state: order.state, order: {} }
           expect(flash[:error]).to eq("Base error\nAdjustments error")
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
@@ -414,7 +387,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: { bill_address_attributes: address_params } }
+          put :update, params: { state: "address", order: {} }
           expect(flash[:error]).to eq(I18n.t('spree.items_cannot_be_shipped'))
           expect(response).to redirect_to(spree.checkout_state_path('address'))
         end
@@ -464,7 +437,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: { bill_address_attributes: address_params } }
+          put :update, params: { state: order.state, order: {} }
           expect(flash[:error]).to eq(I18n.t('spree.insufficient_stock_for_order'))
           expect(response).to redirect_to(spree.cart_path)
         end
@@ -521,11 +494,9 @@ describe Spree::CheckoutController, type: :controller do
       allow(controller).to receive_messages check_authorization: true
     end
 
-    # 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
+    it "doesn't set shipping address on the order" do
       expect(order).to_not receive(:ship_address=)
-      post :update, params: { state: order.state, order: { bill_address_attributes: address_params } }
+      post :update, params: { state: order.state }
     end
 
     it "doesn't remove unshippable items before payment" do
@@ -540,7 +511,7 @@ describe Spree::CheckoutController, type: :controller do
     allow(controller).to receive_messages check_authorization: true
 
     expect {
-      post :update, params: { state: "payment", order: { email: "johndoe@example.com"} }
+      post :update, params: { state: "payment" }
     }.to change { order.line_items.to_a.size }.from(1).to(0)
   end
 

data/spec/controllers/spree/orders_controller_ability_spec.rb

@@ -37,7 +37,7 @@ module Spree
 
       context '#update' do
         it 'should check if user is authorized for :update' do
-          allow(order).to receive :update_attributes
+          allow(order).to receive :update
           expect(controller).to receive(:authorize!).with(:update, order, token)
           post :update, params: { order: { email: "foo@bar.com" }, token: token }
         end

data/spec/controllers/spree/orders_controller_spec.rb

@@ -117,13 +117,13 @@ describe Spree::OrdersController, type: :controller do
         end
 
         it "should redirect to cart path (on success)" do
-          allow(order).to receive(:update_attributes).and_return true
+          allow(order).to receive(:update).and_return true
           put :update
           expect(response).to redirect_to(spree.cart_path)
         end
 
         it "should advance the order if :checkout button is pressed" do
-          allow(order).to receive(:update_attributes).and_return true
+          allow(order).to receive(:update).and_return true
           expect(order).to receive(:next)
           put :update, params: { checkout: true }
           expect(response).to redirect_to checkout_state_path('address')

data/spec/features/checkout_spec.rb

@@ -374,14 +374,6 @@ describe "Checkout", type: :feature, inaccessible: true do
       expect(page).to have_current_path(spree.order_path(Spree::Order.last))
       expect(page).to have_content('Ending in 1111')
     end
-
-    it "allows user to save a billing address associated to the credit card" do
-      choose "use_existing_card_no"
-      fill_in_credit_card
-
-      click_on "Save and Continue"
-      expect(Spree::CreditCard.last.address).to be_present
-    end
   end
 
   # regression for https://github.com/spree/spree/issues/2921

data/spec/features/products_spec.rb

@@ -51,20 +51,20 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     end
 
     it 'displays metas' do
-      jersey.update_attributes metas
+      jersey.update metas
       click_link jersey.name
       expect(page).to have_meta(:description, 'Brand new Ruby on Rails Jersey')
       expect(page).to have_meta(:keywords, 'ror, jersey, ruby')
     end
 
     it 'displays title if set' do
-      jersey.update_attributes metas
+      jersey.update metas
       click_link jersey.name
       expect(page).to have_title('Ruby on Rails Baseball Jersey Buy High Quality Geek Apparel')
     end
 
     it "doesn't use meta_title as heading on page" do
-      jersey.update_attributes metas
+      jersey.update metas
       click_link jersey.name
       within("h1") do
         expect(page).to have_content(jersey.name)
@@ -73,7 +73,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
     end
 
     it 'uses product name in title when meta_title set to empty string' do
-      jersey.update_attributes meta_title: ''
+      jersey.update meta_title: ''
       click_link jersey.name
       expect(page).to have_title('Ruby on Rails Baseball Jersey - ' + store_name)
     end

data/spec/features/taxons_spec.rb

@@ -30,14 +30,14 @@ describe "viewing products", type: :feature, inaccessible: true do
 
   describe 'meta tags and title' do
     it 'displays metas' do
-      t_shirts.update_attributes metas
+      t_shirts.update metas
       visit '/t/category/super-clothing/t-shirts'
       expect(page).to have_meta(:description, 'Brand new Ruby on Rails TShirts')
       expect(page).to have_meta(:keywords, 'ror, tshirt, ruby')
     end
 
     it 'display title if set' do
-      t_shirts.update_attributes metas
+      t_shirts.update metas
       visit '/t/category/super-clothing/t-shirts'
       expect(page).to have_title("Ruby On Rails TShirt")
     end
@@ -49,7 +49,7 @@ describe "viewing products", type: :feature, inaccessible: true do
 
     # Regression test for https://github.com/spree/spree/issues/2814
     it "doesn't use meta_title as heading on page" do
-      t_shirts.update_attributes metas
+      t_shirts.update metas
       visit '/t/category/super-clothing/t-shirts'
       within("h1.taxon-title") do
         expect(page).to have_content(t_shirts.name)
@@ -57,7 +57,7 @@ describe "viewing products", type: :feature, inaccessible: true do
     end
 
     it 'uses taxon name in title when meta_title set to empty string' do
-      t_shirts.update_attributes meta_title: ''
+      t_shirts.update meta_title: ''
       visit '/t/category/super-clothing/t-shirts'
       expect(page).to have_title('Category - T-Shirts - ' + store_name)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.10.0.beta1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2019-09-19 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.9.6
+        version: 2.10.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.0.beta1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.9.6
+        version: 2.10.0.beta1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: responders
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +218,6 @@ files:
 - app/controllers/spree/taxons_controller.rb
 - app/helpers/spree/orders_helper.rb
 - app/helpers/spree/taxon_filters_helper.rb
-- app/models/spree/frontend_configuration.rb
 - app/views/spree/address/_form.html.erb
 - app/views/spree/address/_form_hidden.html.erb
 - app/views/spree/checkout/_address.html.erb
@@ -264,8 +277,10 @@ files:
 - lib/generators/solidus/views/override_generator.rb
 - lib/solidus_frontend.rb
 - lib/spree/frontend.rb
+- lib/spree/frontend/config.rb
 - lib/spree/frontend/engine.rb
 - lib/spree/frontend/middleware/seo_assist.rb
+- lib/spree/frontend_configuration.rb
 - lib/spree_frontend.rb
 - lib/tasks/rake_util.rb
 - lib/tasks/taxon.rake
@@ -332,7 +347,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.