solidus_frontend 2.8.6 → 2.9.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1daacac80ac7da26b638ae0c7a23783bea3e7f0ee82b3d7453b2c6ec8b2543e5
-  data.tar.gz: 93ec515cdff1099ac11b27fcd2c740891c31f3f6569d45868a32d0d3690776e6
+  metadata.gz: d8433838a2873c9b431524473e84aa2bff727cd056016bc9b43b76763fb3c64d
+  data.tar.gz: e0f6e7187afd24eef8091e3d89297a7c9bac56fdae5bac30f93082929611a365
 SHA512:
-  metadata.gz: e7ae3f703517879888b4b079a10443471eebc752080901f7ce79d0e34efda6226ac966ba8103452adfb70f6a379684e44a6fffdd4e6bbe8ded2235d350260393
-  data.tar.gz: d7e3b788e0891df7ca97958055e5927b4e95e6739b5ce4e8f0f4b61e69c49570a156b9941cc41df2e49aa923b5921daa6dee1696ad090ed5805676913c5213e9
+  metadata.gz: d5cf73de2990e034edbd78534e21ea21137f1b4c091aa5bd98d07464c6398f302203f878d633a2c15e7e9dc593f1fb12c7f7d76c2b98e5c97d108d32ebde7bfb
+  data.tar.gz: a7741d38043e4788005a833db5b02c9360cd4ccd2829553fc5cffff0dc320359a123a76dd68c839cc6a4f955e505d63c0ff1bcc36ee01fd02b55d93180b96f8f

data/app/assets/stylesheets/spree/frontend/screen.css.scss

@@ -1265,6 +1265,15 @@ table.order-summary {
 
 }
 
+// # Logo
+#logo {
+  padding: 20px 0;
+  
+  > a {
+    display: inline-block;
+  }
+}
+
 @media only screen and (max-width: 767px) {
   #empty-cart {
     clear: both;

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
 
@@ -231,9 +219,14 @@ module Spree
         @wallet_payment_sources = try_spree_current_user.wallet.wallet_payment_sources
         @default_wallet_payment_source = @wallet_payment_sources.detect(&:default) ||
                                          @wallet_payment_sources.first
-        # TODO: How can we deprecate this instance variable?  We could try
-        # wrapping it in a delegating object that produces deprecation warnings.
-        @payment_sources = try_spree_current_user.wallet.wallet_payment_sources.map(&:payment_source).select { |ps| ps.is_a?(Spree::CreditCard) }
+
+        @payment_sources = Spree::DeprecatedInstanceVariableProxy.new(
+          self,
+          :deprecated_payment_sources,
+          :@payment_sources,
+          Spree::Deprecation,
+          "Please, do not use @payment_sources anymore, use @wallet_payment_sources instead."
+        )
       end
     end
 
@@ -263,5 +256,22 @@ module Spree
         end
       end
     end
+
+    # This method returns payment sources of the current user. It is no more
+    # used into our frontend. We used to assign the content of this method
+    # into an ivar (@payment_sources) into the checkout payment step. This
+    # method is here only to be able to deprecate this ivar and will be removed.
+    #
+    # DO NOT USE THIS METHOD!
+    #
+    # @return [Array<Spree::PaymentSource>] Payment sources connected to
+    #   current user wallet.
+    # @deprecated This method has been added to deprecate @payment_sources
+    #   ivar and will be removed. Use @wallet_payment_sources instead.
+    def deprecated_payment_sources
+      try_spree_current_user.wallet.wallet_payment_sources
+        .map(&:payment_source)
+        .select { |ps| ps.is_a?(Spree::CreditCard) }
+    end
   end
 end

data/app/views/spree/checkout/payment/_gateway.html.erb

@@ -1,14 +1,15 @@
 <%= image_tag 'credit_cards/credit_card.gif', id: 'credit-card-image' %>
 <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
-<div class="field field-required">
+<div class="field field-required card_name" data-hook="card_name">
   <%= label_tag "name_on_card_#{payment_method.id}", t('spree.name_on_card') %>
-  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name" } %>
+  <%= text_field_tag "#{param_prefix}[name]", "#{@order.billing_firstname} #{@order.billing_lastname}", { id: "name_on_card_#{payment_method.id}", autocomplete: "cc-name", class: 'cardName' } %>
 </div>
 
-<div class="field field-required" data-hook="card_number">
+<div class="field field-required card_number" data-hook="card_number">
   <%= label_tag "card_number", t('spree.card_number') %>
   <%= text_field_tag "#{param_prefix}[number]", '', {id: 'card_number', class: 'required cardNumber', size: 19, maxlength: 19, autocomplete: "cc-number", type: "tel" } %>
+
   <span id="card_type" style="display:none;">
     ( <span id="looks_like" ><%= t('spree.card_type_is') %> <span id="type"></span></span>
       <span id="unrecognized"><%= t('spree.unrecognized_card_type') %></span>
@@ -16,12 +17,12 @@
   </span>
 </div>
 
-<div class="field field-required" data-hook="card_expiration">
+<div class="field field-required card_expiration" data-hook="card_expiration">
   <%= label_tag "card_expiry", t('spree.expiration') %>
   <%= text_field_tag "#{param_prefix}[expiry]", '', id: 'card_expiry', class: "required cardExpiry", placeholder: "MM / YY", type: "tel" %>
 </div>
 
-<div class="field field-required" data-hook="card_code">
+<div class="field field-required card_code" data-hook="card_code">
   <%= label_tag "card_code", t('spree.card_code') %>
   <%= text_field_tag "#{param_prefix}[verification_value]", '', {id: 'card_code', class: 'required cardCode', size: 5, type: "tel", autocomplete: "off" } %>
   <%= link_to "(#{t('spree.what_is_this')})", spree.cvv_path, target: '_blank', "data-hook" => "cvv_link", id: "cvv_link" %>

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
@@ -96,7 +96,7 @@ describe Spree::CheckoutController, type: :controller do
         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
 
@@ -271,31 +271,6 @@ 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
@@ -335,18 +310,16 @@ describe Spree::CheckoutController, type: :controller do
       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
@@ -369,7 +342,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", 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
@@ -496,9 +469,7 @@ describe Spree::CheckoutController, type: :controller do
     before do
       allow(order).to receive_messages(line_items: [line_item], state: "payment")
 
-      configure_spree_preferences do |config|
-        config.track_inventory_levels = true
-      end
+      stub_spree_preferences(track_inventory_levels: true)
     end
 
     context "and back orders are not allowed" do
@@ -523,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
@@ -542,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/checkout_controller_with_views_spec.rb

@@ -16,7 +16,7 @@ describe Spree::CheckoutController, type: :controller do
   # Regression test for https://github.com/spree/spree/issues/3246
   context "when using GBP" do
     before do
-      Spree::Config[:currency] = "GBP"
+      stub_spree_preferences(currency: "GBP")
     end
 
     context "when order is in delivery" do

data/spec/controllers/spree/home_controller_spec.rb

@@ -18,7 +18,7 @@ describe Spree::HomeController, type: :controller do
     end
 
     context "different layout specified in config" do
-      before { Spree::Config.layout = 'layouts/application' }
+      before { stub_spree_preferences(layout: 'layouts/application') }
 
       it "renders specified layout" do
         get :index

data/spec/features/address_spec.rb

@@ -24,7 +24,7 @@ describe "Address", type: :feature, inaccessible: true do
     let!(:canada) { create(:country, name: "Canada", states_required: true, iso: "CA") }
     let!(:uk) { create(:country, name: "United Kingdom", states_required: true, iso: "GB") }
 
-    before { Spree::Config[:default_country_iso] = uk.iso }
+    before { stub_spree_preferences(default_country_iso: uk.iso) }
 
     context "but has no state" do
       it "shows the state input field" do

data/spec/features/automatic_promotion_adjustments_spec.rb

@@ -40,10 +40,10 @@ describe "Automatic promotions", type: :feature, js: true do
     it "automatically applies the promotion once the order crosses the threshold" do
       fill_in "order_line_items_attributes_0_quantity", with: 10
       click_button "Update"
-      expect(page).to have_content("Promotion ($10 off when you spend more than $100) -$10.00")
+      expect(page).to have_content("Promotion ($10 off when you spend more than $100) -$10.00", normalize_ws: true)
       fill_in "order_line_items_attributes_0_quantity", with: 1
       click_button "Update"
-      expect(page).not_to have_content("Promotion ($10 off when you spend more than $100) -$10.00")
+      expect(page).not_to have_content("Promotion ($10 off when you spend more than $100) -$10.00", normalize_ws: true)
     end
   end
 end

data/spec/features/caching/taxons_spec.rb

@@ -14,7 +14,7 @@ describe 'taxons', type: :feature, caching: true do
   end
 
   it "busts the cache when max_level_in_taxons_menu conf changes" do
-    Spree::Config[:max_level_in_taxons_menu] = 5
+    stub_spree_preferences(max_level_in_taxons_menu: 5)
     visit spree.root_path
     expect(cache_writes.count).to eq(1)
   end

data/spec/features/checkout_spec.rb

@@ -211,6 +211,26 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
   end
 
+  context "when order has only a void payment" do
+    let(:order) { Spree::TestingSupport::OrderWalkthrough.up_to(:payment) }
+
+    before do
+      user = create(:user)
+      order.user = user
+      order.recalculate
+
+      allow_any_instance_of(Spree::CheckoutController).to receive_messages(current_order: order)
+      allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: user)
+    end
+
+    it "does not allow successful order submission" do
+      visit spree.checkout_path
+      order.payments.first.update state: :void
+      click_button 'Place Order'
+      expect(page).to have_current_path spree.checkout_state_path(:payment)
+    end
+  end
+
   # Regression test for https://github.com/spree/spree/issues/2694 and https://github.com/spree/spree/issues/4117
   context "doesn't allow bad credit card numbers" do
     let!(:payment_method) { create(:credit_card_payment_method) }
@@ -338,30 +358,21 @@ describe "Checkout", type: :feature, inaccessible: true do
     it "selects first source available and customer moves on" do
       expect(find("#use_existing_card_yes")).to be_checked
 
-      expect {
-        click_on "Save and Continue"
-      }.not_to change { Spree::CreditCard.count }
-
+      click_on "Save and Continue"
       click_on "Place Order"
       expect(page).to have_current_path(spree.order_path(Spree::Order.last))
+      expect(page).to have_current_path(spree.order_path(Spree::Order.last))
+      expect(page).to have_content("Ending in #{credit_card.last_digits}")
     end
 
     it "allows user to enter a new source" do
       choose "use_existing_card_no"
+      fill_in_credit_card
 
-      fill_in "Name on card", with: 'Spree Commerce'
-      fill_in_with_force "Card Number", with: '4111 1111 1111 1111'
-      fill_in "card_expiry", with: '04 / 20'
-      fill_in "Card Code", with: '123'
-
-      expect {
-        click_on "Save and Continue"
-      }.to change { Spree::CreditCard.count }.by 1
-
-      expect(Spree::CreditCard.last.address).to be_present
-
+      click_on "Save and Continue"
       click_on "Place Order"
       expect(page).to have_current_path(spree.order_path(Spree::Order.last))
+      expect(page).to have_content('Ending in 1111')
     end
   end
 
@@ -498,7 +509,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
   end
 
-  context "order has only payment step" do
+  context "order has only payment step", js: true do
     before do
       create(:credit_card_payment_method)
       @old_checkout_flow = Spree::Order.checkout_flow
@@ -523,10 +534,7 @@ describe "Checkout", type: :feature, inaccessible: true do
       expect(page).to have_current_path(spree.checkout_state_path('payment'))
 
       choose "Credit Card"
-      fill_in "Name on card", with: 'Spree Commerce'
-      fill_in "Card Number", with: '4111 1111 1111 1111'
-      fill_in "card_expiry", with: '04 / 20'
-      fill_in "Card Code", with: '123'
+      fill_in_credit_card
       click_button "Save and Continue"
 
       expect(current_path).to eq spree.checkout_state_path('confirm')
@@ -582,7 +590,7 @@ describe "Checkout", type: :feature, inaccessible: true do
     end
 
     it "displays a thank you message" do
-      expect(page).to have_content(I18n.t('spree.thank_you_for_your_order'))
+      expect(page).to have_content(I18n.t('spree.thank_you_for_your_order'), normalize_ws: true)
     end
 
     it "does not display a thank you message on that order future visits" do
@@ -657,16 +665,17 @@ describe "Checkout", type: :feature, inaccessible: true do
       click_on "Save and Continue"
       click_on "Save and Continue"
 
-      fill_in_credit_card(number: "4111 1111 1111 1111")
+      fill_in_credit_card
       click_on "Save and Continue"
 
       expect(page).to have_current_path("/checkout/confirm")
     end
   end
 
-  def fill_in_credit_card(number:)
-    fill_in "Card Number", with: number
-    fill_in "Expiration", with: "12 / 24"
+  def fill_in_credit_card(number: "4111 1111 1111 1111")
+    fill_in "Name on card", with: 'Mary Doe'
+    fill_in_with_force "Card Number", with: number
+    fill_in_with_force "Expiration", with: "12 / 24"
     fill_in "Card Code", with: "123"
   end
 

data/spec/features/coupon_code_spec.rb

@@ -69,14 +69,14 @@ describe "Coupon code promotions", type: :feature, js: true do
           expect(page).to have_content(I18n.t('spree.coupon_code_not_found'))
           fill_in "order_coupon_code", with: "onetwo"
           click_button "Apply Code"
-          expect(page).to have_content("Promotion (Onetwo)   -$10.00")
+          expect(page).to have_content("Promotion (Onetwo) -$10.00", normalize_ws: true)
         end
 
         context "with a promotion" do
           it "applies a promotion to an order" do
             fill_in "order_coupon_code", with: "onetwo"
             click_button "Apply Code"
-            expect(page).to have_content("Promotion (Onetwo)   -$10.00")
+            expect(page).to have_content("Promotion (Onetwo) -$10.00", normalize_ws: true)
           end
         end
       end
@@ -202,7 +202,7 @@ describe "Coupon code promotions", type: :feature, js: true do
             # 20% of $40 = 8
             # 20% of $20 = 4
             # Therefore: promotion discount amount is $12.
-            expect(page).to have_content("Promotion (Onetwo) -$12.00")
+            expect(page).to have_content("Promotion (Onetwo) -$12.00", normalize_ws: true)
           end
 
           within '.cart-total' do
@@ -241,7 +241,7 @@ describe "Coupon code promotions", type: :feature, js: true do
           click_button "Apply Code"
 
           within '#cart_adjustments' do
-            expect(page).to have_content("Promotion (Onetwo) -$30.00")
+            expect(page).to have_content("Promotion (Onetwo) -$30.00", normalize_ws: true)
           end
 
           within '.cart-total' do
@@ -253,7 +253,7 @@ describe "Coupon code promotions", type: :feature, js: true do
           click_button "Update"
 
           within '#cart_adjustments' do
-            expect(page).to have_content("Promotion (Onetwo) -$60.00")
+            expect(page).to have_content("Promotion (Onetwo) -$60.00", normalize_ws: true)
           end
 
           within '.cart-total' do

data/spec/features/currency_spec.rb

@@ -14,7 +14,7 @@ describe "Switching currencies in backend", type: :feature do
     click_link "RoR Mug"
     click_button "Add To Cart"
     # Now that we have an order...
-    Spree::Config[:currency] = "AUD"
+    stub_spree_preferences(currency: "AUD")
     visit spree.root_path
   end
 end

data/spec/features/first_order_promotion_spec.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.feature "First Order promotion" do
+  given!(:promotion) do
+    FactoryBot.create(
+      :promotion_with_first_order_rule,
+      :with_order_adjustment,
+      code: "FIRSTONEFREE",
+      per_code_usage_limit: 10
+    )
+  end
+
+  background do
+    create(:store)
+    product = FactoryBot.create(:product)
+    visit spree.root_path
+    click_link product.name
+    click_button "Add To Cart"
+  end
+
+  scenario "Adding first order promotion to cart and checking out as guest" do
+    fill_in "Coupon code", with: "FIRSTONEFREE"
+    click_button "Apply Code"
+    expect(page).to have_content("The coupon code was successfully applied to your order")
+
+    within("#cart_adjustments") do
+      expect(page).to have_content("-$10.00")
+    end
+  end
+
+  scenario "Trying to reuse first order promotion" do
+    previous_user = FactoryBot.create(
+      :user,
+      email: "sam@tom.com"
+    )
+    _previous_order = create(:completed_order_with_totals, user: previous_user)
+    fill_in "Coupon code", with: "FIRSTONEFREE"
+    click_button "Apply Code"
+    expect(page).to have_content("The coupon code was successfully applied to your order")
+    click_on "Checkout"
+    fill_in "Customer E-Mail", with: "sam@tom.com"
+    fill_in_address
+    click_on "Save and Continue"
+    expect(page).to_not have_content("#summary-order-charges")
+  end
+
+  def fill_in_address
+    address = "order_bill_address_attributes"
+    fill_in "#{address}_firstname", with: "Ryan"
+    fill_in "#{address}_lastname", with: "Bigg"
+    fill_in "#{address}_address1", with: "143 Swan Street"
+    fill_in "#{address}_city", with: "Richmond"
+    select "United States of America", from: "#{address}_country_id"
+    fill_in "#{address}_zipcode", with: "12345"
+    fill_in "#{address}_phone", with: "(555) 555-5555"
+  end
+end

data/spec/features/free_shipping_promotions_spec.rb

@@ -52,8 +52,8 @@ describe "Free shipping promotions", type: :feature, js: true do
     # Regression test for https://github.com/spree/spree/issues/4428
     it "applies the free shipping promotion" do
       within("#checkout-summary") do
-        expect(page).to have_content("Shipping total:  $10.00")
-        expect(page).to have_content("Promotion (Free Shipping): -$10.00")
+        expect(page).to have_content("Shipping total: $10.00", normalize_ws: true)
+        expect(page).to have_content("Promotion (Free Shipping): -$10.00", normalize_ws: true)
       end
     end
   end

data/spec/features/products_spec.rb

@@ -93,7 +93,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   context "using Russian Rubles as a currency" do
     before do
-      Spree::Config[:currency] = "RUB"
+      stub_spree_preferences(currency: "RUB")
     end
 
     let!(:product) do
@@ -199,8 +199,8 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   it "should be able to hide products without price" do
     expect(page.all('ul.product-listing li').size).to eq(9)
-    Spree::Config.show_products_without_price = false
-    Spree::Config.currency = "CAN"
+    stub_spree_preferences(show_products_without_price: false)
+    stub_spree_preferences(currency: "CAN")
     visit spree.root_path
     expect(page.all('ul.product-listing li').size).to eq(0)
   end
@@ -224,7 +224,7 @@ describe "Visiting Products", type: :feature, inaccessible: true do
   end
 
   it "should be able to display products priced between 15 and 18 dollars across multiple pages" do
-    Spree::Config.products_per_page = 2
+    stub_spree_preferences(products_per_page: 2)
     within(:css, '#taxonomies') { click_link "Ruby on Rails" }
     check "Price_Range_$15.00_-_$18.00"
     within(:css, '#sidebar_products_search') { click_button "Search" }
@@ -263,8 +263,8 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   it "shouldn't be able to put a product without a current price in the cart" do
     product = FactoryBot.create(:base_product, description: nil, name: 'Sample', price: '19.99')
-    Spree::Config.currency = "CAN"
-    Spree::Config.show_products_without_price = true
+    stub_spree_preferences(currency: "CAN")
+    stub_spree_preferences(show_products_without_price: true)
     visit spree.product_path(product)
     expect(page).to have_content "This product is not available in the selected currency."
     expect(page).not_to have_content "add-to-cart-button"
@@ -272,8 +272,8 @@ describe "Visiting Products", type: :feature, inaccessible: true do
 
   it "should be able to list products without a price" do
     product = FactoryBot.create(:base_product, description: nil, name: 'Sample', price: '19.99')
-    Spree::Config.currency = "CAN"
-    Spree::Config.show_products_without_price = true
+    stub_spree_preferences(currency: "CAN")
+    stub_spree_preferences(show_products_without_price: true)
     visit spree.products_path
     expect(page).to have_content(product.name)
   end

data/spec/spec_helper.rb

@@ -75,7 +75,6 @@ RSpec.configure do |config|
 
   config.before(:each) do
     Rails.cache.clear
-    reset_spree_preferences
   end
 
   config.before(:each, type: :feature) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_frontend
 version: !ruby/object:Gem::Version
-  version: 2.8.6
+  version: 2.9.0.rc.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2019-07-01 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.6
+        version: 2.9.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.6
+        version: 2.9.0.rc.1
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.6
+        version: 2.9.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.6
+        version: 2.9.0.rc.1
 - !ruby/object:Gem::Dependency
   name: canonical-rails
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +293,7 @@ files:
 - spec/features/checkout_unshippable_spec.rb
 - spec/features/coupon_code_spec.rb
 - spec/features/currency_spec.rb
+- spec/features/first_order_promotion_spec.rb
 - spec/features/free_shipping_promotions_spec.rb
 - spec/features/locale_spec.rb
 - spec/features/order_spec.rb
@@ -307,7 +308,6 @@ files:
 - spec/helpers/order_helper_spec.rb
 - spec/helpers/taxon_filters_helper_spec.rb
 - spec/spec_helper.rb
-- spec/support/features/fill_in_with_force.rb
 - spec/support/shared_contexts/checkout_setup.rb
 - spec/support/shared_contexts/custom_products.rb
 - spec/support/shared_contexts/locales.rb
@@ -332,7 +332,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements:
 - none
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Cart and storefront for the Solidus e-commerce project.

data/spec/support/features/fill_in_with_force.rb

@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-module FillInWithForce
-  def fill_in_with_force(locator, with:)
-    field_id = find_field(locator)[:id]
-    page.execute_script "document.getElementById('#{field_id}').value = '#{with}';"
-  end
-end
-
-RSpec.configure do |config|
-  config.include FillInWithForce, type: :feature
-end