diff --git a/spec/support/split_checkout_helper.rb b/spec/support/split_checkout_helper.rb index 24a80c50d6..bcaf1cec4c 100644 --- a/spec/support/split_checkout_helper.rb +++ b/spec/support/split_checkout_helper.rb @@ -9,10 +9,6 @@ module SplitCheckoutHelper click_button "Checkout as guest" end - def place_order - find("button", text: "Complete order").click - end - def fill_out_details fill_in "First Name", with: "Will" fill_in "Last Name", with: "Marshall" @@ -52,5 +48,14 @@ module SplitCheckoutHelper expect(page).to have_selector("div.checkout-tab.selected", text: "1 - Your details") expect(page).to have_content("2 - Payment method") expect(page).to have_content("3 - Order summary") + + def proceed_to_summary + click_on "Next - Order summary" + expect(page).to have_button("Complete order") + end + + def place_order + click_on "Complete order" + expect(page).to have_content "Back To Store" end end diff --git a/spec/system/consumer/split_checkout_spec.rb b/spec/system/consumer/split_checkout_spec.rb index be816b5ae3..e4cdcd9b1b 100644 --- a/spec/system/consumer/split_checkout_spec.rb +++ b/spec/system/consumer/split_checkout_spec.rb @@ -438,11 +438,9 @@ describe "As a consumer, I want to checkout my order", js: true do it "proceeds to the summary step and completes the order" do choose pay_method.to_s - click_on "Next - Order summary" - expect(page).to have_content "Shopping @ #{distributor.name}" + proceed_to_summary - click_on "Complete order" - expect(page).to have_content "Back To Store" + place_order expect(page).to have_content "Paying via: #{pay_method}" expect(order.reload.state).to eq "complete" end @@ -457,8 +455,7 @@ describe "As a consumer, I want to checkout my order", js: true do it "selects Stripe SCA and proceeds to the summary step" do choose pay_method.to_s fill_out_card_details - click_on "Next - Order summary" - expect(page).to have_content "Shopping @ #{distributor.name}" + proceed_to_summary end end end @@ -513,7 +510,7 @@ describe "As a consumer, I want to checkout my order", js: true do expect(page).to have_content "Shopping @ #{distributor.name}" - click_on "Complete order" + place_order expect(page).to have_content "Back To Store" expect(order.reload.state).to eq "complete"