From a59b136864ef4c1a83639b840e57fe59f647ef3e Mon Sep 17 00:00:00 2001 From: Rob H Date: Wed, 20 Feb 2013 15:16:43 +1100 Subject: [PATCH] Spree 1.3 upgrade: fix final failing tests --- spec/features/admin/enterprise_fees_spec.rb | 11 ++++++++++- spec/features/consumer/checkout_spec.rb | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb index 35e8d95407..cf06faf061 100644 --- a/spec/features/admin/enterprise_fees_spec.rb +++ b/spec/features/admin/enterprise_fees_spec.rb @@ -6,6 +6,15 @@ feature %q{ }, js: true do include AuthenticationWorkflow include WebHelper + + before :all do + @default_wait_time = Capybara.default_wait_time + Capybara.default_wait_time = 5 + end + + after :all do + Capybara.default_wait_time = @default_wait_time + end scenario "listing enterprise fees" do fee = create(:enterprise_fee) @@ -14,7 +23,7 @@ feature %q{ click_link 'Configuration' click_link 'Enterprise Fees' - page.should have_selector "option[selected]", text: fee.enterprise.name + page.should have_selector "#enterprise_fee_set_collection_attributes_0_enterprise_id", :text => fee.enterprise.name page.should have_selector "option[selected]", text: 'Packing' page.should have_selector "input[value='$0.50 / kg']" page.should have_selector "option[selected]", text: 'Weight (per kg)' diff --git a/spec/features/consumer/checkout_spec.rb b/spec/features/consumer/checkout_spec.rb index c88f0da8ca..24dae83677 100644 --- a/spec/features/consumer/checkout_spec.rb +++ b/spec/features/consumer/checkout_spec.rb @@ -7,6 +7,15 @@ feature %q{ } do include AuthenticationWorkflow include WebHelper + + before :all do + @default_wait_time = Capybara.default_wait_time + Capybara.default_wait_time = 5 + end + + after :all do + Capybara.default_wait_time = @default_wait_time + end background do @distributor = create(:distributor_enterprise, :name => 'Edible garden',