From 169d5669f110515f9fff00c0dde86bf30812f4aa Mon Sep 17 00:00:00 2001 From: Rob H Date: Wed, 7 May 2014 13:34:47 +1000 Subject: [PATCH] Amend specs --- spec/features/admin/order_cycles_spec.rb | 2 +- spec/features/consumer/shopping/checkout_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb index 9ee0ff5ff0..e0c7d1ae5b 100644 --- a/spec/features/admin/order_cycles_spec.rb +++ b/spec/features/admin/order_cycles_spec.rb @@ -285,7 +285,7 @@ feature %q{ click_button 'Add supplier' page.all("table.exchanges tr.supplier td.products input").each { |e| e.click } - wait_until { page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).present? } + page.should have_selector "#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true page.find("#order_cycle_incoming_exchange_1_variants_#{initial_variants.last.id}", visible: true).click # uncheck (with visible:true filter) check "order_cycle_incoming_exchange_2_variants_#{v1.id}" check "order_cycle_incoming_exchange_2_variants_#{v2.id}" diff --git a/spec/features/consumer/shopping/checkout_spec.rb b/spec/features/consumer/shopping/checkout_spec.rb index e4a6e56437..adb6071784 100644 --- a/spec/features/consumer/shopping/checkout_spec.rb +++ b/spec/features/consumer/shopping/checkout_spec.rb @@ -96,7 +96,8 @@ feature "As a consumer I want to check out my cart", js: true do page.should have_content "Your order has been processed successfully", wait: 10 ActionMailer::Base.deliveries.length.should == 1 email = ActionMailer::Base.deliveries.last - email.subject.should include "Spree Demo Site Order Confirmation" + site_name = Spree::Config[:site_name] + email.subject.should include "#{site_name} Order Confirmation" end it "takes us to the order confirmation page when submitted with 'same as billing address' checked" do