solidus_frontend 2.6.5 → 2.9.0

data/spec/controllers/spree/orders_controller_ability_spec.rb

@@ -7,8 +7,6 @@ module Spree
     ORDER_TOKEN = 'ORDER_TOKEN'
 
     let!(:store) { create(:store) }
-    let(:user) { create(:user) }
-    let(:guest_user) { create(:user) }
     let(:order) { Spree::Order.create }
     let(:variant) { create(:variant) }
 
@@ -18,62 +16,45 @@ module Spree
 
     context 'when an order exists in the cookies.signed' do
       let(:token) { 'some_token' }
-      let(:specified_order) { create(:order) }
 
       before do
         allow(controller).to receive_messages current_order: order
-        allow(controller).to receive_messages spree_current_user: user
       end
 
       context '#populate' do
-        it 'should check if user is authorized for :edit' do
-          expect(controller).to receive(:authorize!).with(:edit, order, token)
+        it 'should check if user is authorized for :update' do
+          expect(controller).to receive(:authorize!).with(:update, order, token)
           post :populate, params: { variant_id: variant.id, token: token }
         end
-        it "should check against the specified order" do
-          expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          post :populate, params: { id: specified_order.number, variant_id: variant.id, token: token }
-        end
       end
 
       context '#edit' do
-        it 'should check if user is authorized for :edit' do
-          expect(controller).to receive(:authorize!).with(:edit, order, token)
+        it 'should check if user is authorized for :read' do
+          expect(controller).to receive(:authorize!).with(:read, order, token)
           get :edit, params: { token: token }
         end
-        it "should check against the specified order" do
-          expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          get :edit, params: { id: specified_order.number, token: token }
-        end
       end
 
       context '#update' do
-        it 'should check if user is authorized for :edit' do
+        it 'should check if user is authorized for :update' do
           allow(order).to receive :update_attributes
-          expect(controller).to receive(:authorize!).with(:edit, order, token)
+          expect(controller).to receive(:authorize!).with(:update, order, token)
           post :update, params: { order: { email: "foo@bar.com" }, token: token }
         end
-        it "should check against the specified order" do
-          allow(order).to receive :update_attributes
-          expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          post :update, params: { order: { email: "foo@bar.com" }, id: specified_order.number, token: token }
-        end
       end
 
       context '#empty' do
-        it 'should check if user is authorized for :edit' do
-          expect(controller).to receive(:authorize!).with(:edit, order, token)
+        it 'should check if user is authorized for :update' do
+          expect(controller).to receive(:authorize!).with(:update, order, token)
           post :empty, params: { token: token }
         end
-        it "should check against the specified order" do
-          expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
-          post :empty, params: { id: specified_order.number, token: token }
-        end
       end
 
       context "#show" do
+        let(:specified_order) { create(:order) }
+
         it "should check against the specified order" do
-          expect(controller).to receive(:authorize!).with(:edit, specified_order, token)
+          expect(controller).to receive(:authorize!).with(:read, specified_order, token)
           get :show, params: { id: specified_order.number, token: token }
         end
       end

data/spec/controllers/spree/orders_controller_spec.rb

@@ -105,7 +105,7 @@ describe Spree::OrdersController, type: :controller do
     context "#update" do
       context "with authorization" do
         before do
-          allow(controller).to receive :check_authorization
+          allow(controller).to receive :authorize!
           allow(controller).to receive_messages current_order: order
         end
 
@@ -128,12 +128,63 @@ describe Spree::OrdersController, type: :controller do
           put :update, params: { checkout: true }
           expect(response).to redirect_to checkout_state_path('address')
         end
+
+        context 'trying to apply a coupon code' do
+          let(:order) { create(:order_with_line_items, state: 'cart') }
+          let(:coupon_code) { "coupon_code" }
+
+          context "when coupon code is empty" do
+            let(:coupon_code) { "" }
+
+            it 'does not try to apply coupon code' do
+              expect(Spree::PromotionHandler::Coupon).not_to receive :new
+
+              put :update, params: { state: order.state, order: { coupon_code: coupon_code } }
+
+              expect(response).to redirect_to(spree.cart_path)
+            end
+          end
+
+          context "when coupon code is applied" do
+            let(:promotion_handler) { instance_double('Spree::PromotionHandler::Coupon', error: nil, success: 'Coupon Applied!') }
+
+            it "continues checkout flow normally" do
+              expect(Spree::Deprecation).to receive(:warn)
+
+              expect(Spree::PromotionHandler::Coupon)
+                .to receive_message_chain(:new, :apply)
+                .and_return(promotion_handler)
+
+              put :update, params: { state: order.state, order: { coupon_code: coupon_code } }
+
+              expect(response).to redirect_to(spree.cart_path)
+              expect(flash.now[:success]).to eq('Coupon Applied!')
+            end
+
+            context "when coupon code is not applied" do
+              let(:promotion_handler) { instance_double('Spree::PromotionHandler::Coupon', error: 'Some error', success: false) }
+
+              it "render cart with coupon error" do
+                expect(Spree::Deprecation).to receive(:warn)
+
+                expect(Spree::PromotionHandler::Coupon)
+                  .to receive_message_chain(:new, :apply)
+                  .and_return(promotion_handler)
+
+                put :update, params: { state: order.state, order: { coupon_code: coupon_code } }
+
+                expect(response).to render_template :edit
+                expect(flash.now[:error]).to eq('Some error')
+              end
+            end
+          end
+        end
       end
     end
 
     context "#empty" do
       before do
-        allow(controller).to receive :check_authorization
+        allow(controller).to receive :authorize!
       end
 
       it "should destroy line items in the current order" do
@@ -165,7 +216,7 @@ describe Spree::OrdersController, type: :controller do
     let!(:line_item) { order.contents.add(variant, 1) }
 
     before do
-      allow(controller).to receive(:check_authorization)
+      allow(controller).to receive :authorize!
       allow(controller).to receive_messages(current_order: order)
     end
 

data/spec/controllers/spree/products_controller_spec.rb

@@ -7,7 +7,7 @@ describe Spree::ProductsController, type: :controller do
 
   # Regression test for https://github.com/spree/spree/issues/1390
   it "allows admins to view non-active products" do
-    allow(controller).to receive_messages spree_current_user: mock_model(Spree.user_class, has_spree_role?: true, last_incomplete_spree_order: nil, spree_api_key: 'fake')
+    allow(controller).to receive_messages try_spree_current_user: mock_model(Spree.user_class, has_spree_role?: true, last_incomplete_spree_order: nil, spree_api_key: 'fake')
     get :show, params: { id: product.to_param }
     expect(response.status).to eq(200)
   end
@@ -20,7 +20,7 @@ describe Spree::ProductsController, type: :controller do
 
   it "should provide the current user to the searcher class" do
     user = mock_model(Spree.user_class, last_incomplete_spree_order: nil, spree_api_key: 'fake')
-    allow(controller).to receive_messages spree_current_user: user
+    allow(controller).to receive_messages try_spree_current_user: user
     expect_any_instance_of(Spree::Config.searcher_class).to receive(:current_user=).with(user)
     get :index
     expect(response.status).to eq(200)
@@ -29,7 +29,7 @@ describe Spree::ProductsController, type: :controller do
   # Regression test for https://github.com/spree/spree/issues/2249
   it "doesn't error when given an invalid referer" do
     current_user = mock_model(Spree.user_class, has_spree_role?: true, last_incomplete_spree_order: nil, generate_spree_api_key!: nil)
-    allow(controller).to receive_messages spree_current_user: current_user
+    allow(controller).to receive_messages try_spree_current_user: current_user
     request.env['HTTP_REFERER'] = "not|a$url"
 
     # Previously a URI::InvalidURIError exception was being thrown

data/spec/controllers/spree/taxons_controller_spec.rb

@@ -6,7 +6,7 @@ describe Spree::TaxonsController, type: :controller do
   it "should provide the current user to the searcher class" do
     taxon = create(:taxon, permalink: "test")
     user = mock_model(Spree.user_class, last_incomplete_spree_order: nil, spree_api_key: 'fake')
-    allow(controller).to receive_messages spree_current_user: user
+    allow(controller).to receive_messages try_spree_current_user: user
     expect_any_instance_of(Spree::Config.searcher_class).to receive(:current_user=).with(user)
     get :show, params: { id: taxon.permalink }
     expect(response.status).to eq(200)

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_confirm_insufficient_stock_spec.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe "Checkout confirm page submission", type: :feature do
+  include_context 'checkout setup'
+
+  context "when the product from the order is not backorderable but has enough stock quantity" do
+    let(:user) { create(:user) }
+
+    let(:order) { Spree::TestingSupport::OrderWalkthrough.up_to(:payment) }
+    let(:order_product) { order.products.first }
+    let(:order_stock_item) { order_product.stock_items.first }
+
+    before do
+      order_stock_item.update! backorderable: false
+      order_stock_item.set_count_on_hand(1)
+      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)
+      allow_any_instance_of(Spree::OrdersController).to receive_messages(try_spree_current_user: user)
+    end
+
+    context 'when there are not other backorderable stock locations' do
+      context 'when the customer is on the confirm page and the availabilty drops to zero' do
+        before do
+          visit spree.checkout_state_path(:confirm)
+          order_stock_item.set_count_on_hand(0)
+        end
+
+        it 'redirects to cart page and shows an unavailable product message' do
+          click_button "Place Order"
+          expect(page).to have_content "#{order_product.name} became unavailable"
+          expect(page).to have_current_path spree.cart_path
+        end
+      end
+    end
+
+    context 'when there is another backorderable stock location' do
+      before do
+        create :stock_location, backorderable_default: true, default: false
+      end
+
+      context 'when the customer is on the confirm page and the availabilty drops to zero' do
+        before do
+          visit spree.checkout_state_path(:confirm)
+          order_stock_item.set_count_on_hand(0)
+        end
+
+        it "redirects to the address checkout page and shows an availability changed message" do
+          click_button "Place Order"
+          error_message = "Quantity selected of #{order_product.name} is not available. Still, items may be available from another stock location, please try again."
+          expect(page).to have_content error_message
+          expect(page).to have_current_path spree.checkout_state_path(:address)
+        end
+
+        it "can still complete the order using the backorderable stock location by restarting the checkout" do
+          click_button "Place Order"
+          expect(page).to have_current_path spree.checkout_state_path(:address)
+          click_button "Save and Continue"
+          expect(page).to have_current_path spree.checkout_state_path(:delivery)
+          click_button "Save and Continue"
+          expect(page).to have_current_path spree.checkout_state_path(:payment)
+          click_button "Save and Continue"
+          expect(page).to have_current_path spree.checkout_state_path(:confirm)
+          click_button "Place Order"
+          expect(page).to have_content 'Your order has been processed successfully'
+        end
+      end
+    end
+  end
+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

@@ -11,7 +11,7 @@ describe "Coupon code promotions", type: :feature, js: true do
   let!(:payment_method) { create(:check_payment_method) }
   let!(:product) { create(:product, name: "RoR Mug", price: 20) }
 
-  context "visitor makes checkout as guest without registration" do
+  context "visitor makes checkout" do
     def create_basic_coupon_promotion(code)
       promotion = create(
         :promotion,
@@ -34,49 +34,89 @@ describe "Coupon code promotions", type: :feature, js: true do
 
     let!(:promotion) { create_basic_coupon_promotion("onetwo") }
 
-    # OrdersController
     context "on the payment page" do
-      before do
-        visit spree.root_path
-        click_link "RoR Mug"
-        click_button "add-to-cart-button"
-        click_button "Checkout"
-        fill_in "order_email", with: "spree@example.com"
-        fill_in "First Name", with: "John"
-        fill_in "Last Name", with: "Smith"
-        fill_in "Street Address", with: "1 John Street"
-        fill_in "City", with: "City of John"
-        fill_in "Zip", with: "01337"
-        select country.name, from: "Country"
-        select state.name, from: "order[bill_address_attributes][state_id]"
-        fill_in "Phone", with: "555-555-5555"
-
-        # To shipping method screen
-        click_button "Save and Continue"
-        # To payment screen
-        click_button "Save and Continue"
-      end
+      context "as guest without registration" do
+        before do
+          visit spree.root_path
+          click_link "RoR Mug"
+          click_button "add-to-cart-button"
+          click_button "Checkout"
+          fill_in "order_email", with: "spree@example.com"
+          fill_in "First Name", with: "John"
+          fill_in "Last Name", with: "Smith"
+          fill_in "Street Address", with: "1 John Street"
+          fill_in "City", with: "City of John"
+          fill_in "Zip", with: "01337"
+          select country.name, from: "Country"
+          select state.name, from: "order[bill_address_attributes][state_id]"
+          fill_in "Phone", with: "555-555-5555"
+
+          # To shipping method screen
+          click_button "Save and Continue"
+          # To payment screen
+          click_button "Save and Continue"
+        end
 
-      it "informs about an invalid coupon code" do
-        fill_in "order_coupon_code", with: "coupon_codes_rule_man"
-        click_button "Save and Continue"
-        expect(page).to have_content(I18n.t('spree.coupon_code_not_found'))
-      end
+        it "informs about an invalid coupon code" do
+          fill_in "order_coupon_code", with: "coupon_codes_rule_man"
+          click_button "Apply Code"
+          expect(page).to have_content(I18n.t('spree.coupon_code_not_found'))
+        end
 
-      it "can enter an invalid coupon code, then a real one" do
-        fill_in "order_coupon_code", with: "coupon_codes_rule_man"
-        click_button "Save and Continue"
-        expect(page).to have_content(I18n.t('spree.coupon_code_not_found'))
-        fill_in "order_coupon_code", with: "onetwo"
-        click_button "Save and Continue"
-        expect(page).to have_content("Promotion (Onetwo)   -$10.00")
+        it "can enter an invalid coupon code, then a real one" do
+          fill_in "order_coupon_code", with: "coupon_codes_rule_man"
+          click_button "Apply Code"
+          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", 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", normalize_ws: true)
+          end
+        end
       end
 
-      context "with a promotion" do
-        it "applies a promotion to an order" do
-          fill_in "order_coupon_code", with: "onetwo"
-          click_button "Save and Continue"
-          expect(page).to have_content("Promotion (Onetwo)   -$10.00")
+      context 'as logged user' do
+        let!(:user) { create(:user, bill_address: create(:address), ship_address: create(:address)) }
+
+        before do
+          allow_any_instance_of(Spree::CheckoutController).to receive_messages(try_spree_current_user: user)
+          allow_any_instance_of(Spree::OrdersController).to receive_messages(try_spree_current_user: user)
+        end
+
+        context 'with saved credit card' do
+          let(:bogus) { create(:credit_card_payment_method) }
+          let!(:credit_card) do
+            create(:credit_card, user_id: user.id, payment_method: bogus, gateway_customer_profile_id: "BGS-WEFWF")
+          end
+
+          before do
+            user.wallet.add(credit_card)
+
+            visit spree.root_path
+            click_link "RoR Mug"
+            click_button "add-to-cart-button"
+            # To Cart
+            click_button "Checkout"
+            # To shipping method screen, address is auto-populated
+            # with user's saved addresses
+            click_button "Save and Continue"
+            # To payment screen
+            click_button "Save and Continue"
+          end
+
+          it "shows wallet payments on coupon code errors" do
+            fill_in "order_coupon_code", with: "coupon_codes_rule_man"
+            click_button "Apply Code"
+
+            expect(page).to have_content("The coupon code you entered doesn't exist. Please try again.")
+            expect(page).to have_content("Use an existing card")
+          end
         end
       end
     end
@@ -90,22 +130,22 @@ describe "Coupon code promotions", type: :feature, js: true do
       end
 
       it "can enter a coupon code and receives success notification" do
-        fill_in "order_coupon_code", with: "onetwo"
-        click_button "Update"
+        fill_in "coupon_code", with: "onetwo"
+        click_button "Apply Code"
         expect(page).to have_content(I18n.t('spree.coupon_code_applied'))
       end
 
       it "can enter a promotion code with both upper and lower case letters" do
-        fill_in "order_coupon_code", with: "ONETwO"
-        click_button "Update"
+        fill_in "coupon_code", with: "ONETwO"
+        click_button "Apply Code"
         expect(page).to have_content(I18n.t('spree.coupon_code_applied'))
       end
 
       it "informs the user about a coupon code which has exceeded its usage" do
         expect_any_instance_of(Spree::Promotion).to receive(:usage_limit_exceeded?).and_return(true)
 
-        fill_in "order_coupon_code", with: "onetwo"
-        click_button "Update"
+        fill_in "coupon_code", with: "onetwo"
+        click_button "Apply Code"
         expect(page).to have_content(I18n.t('spree.coupon_code_max_usage'))
       end
 
@@ -120,8 +160,8 @@ describe "Coupon code promotions", type: :feature, js: true do
         specify do
           visit spree.cart_path
 
-          fill_in "order_coupon_code", with: "onetwo"
-          click_button "Update"
+          fill_in "coupon_code", with: "onetwo"
+          click_button "Apply Code"
           expect(page).to have_content(I18n.t(:item_total_less_than_or_equal, scope: [:spree, :eligibility_errors, :messages], amount: "$100.00"))
         end
       end
@@ -130,8 +170,8 @@ describe "Coupon code promotions", type: :feature, js: true do
         promotion.expires_at = Date.today.beginning_of_week
         promotion.starts_at = Date.today.beginning_of_week.advance(day: 3)
         promotion.save!
-        fill_in "order_coupon_code", with: "onetwo"
-        click_button "Update"
+        fill_in "coupon_code", with: "onetwo"
+        click_button "Apply Code"
         expect(page).to have_content(I18n.t('spree.coupon_code_expired'))
       end
 
@@ -151,8 +191,8 @@ describe "Coupon code promotions", type: :feature, js: true do
           click_button "add-to-cart-button"
 
           visit spree.cart_path
-          fill_in "order_coupon_code", with: "onetwo"
-          click_button "Update"
+          fill_in "coupon_code", with: "onetwo"
+          click_button "Apply Code"
 
           fill_in "order_line_items_attributes_0_quantity", with: 2
           fill_in "order_line_items_attributes_1_quantity", with: 2
@@ -162,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
@@ -197,11 +237,11 @@ describe "Coupon code promotions", type: :feature, js: true do
             expect(page).to have_content("$30.00")
           end
 
-          fill_in "order_coupon_code", with: "onetwo"
-          click_button "Update"
+          fill_in "coupon_code", with: "onetwo"
+          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
@@ -213,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