From 930bc2b7cebed359263e0c443e600f4cd8383027 Mon Sep 17 00:00:00 2001
From: Rohan Mitchell <rohan@rohanmitchell.com>
Date: Fri, 2 May 2014 14:09:42 +1000
Subject: [PATCH] Set increased Capybara.default_wait_time globally

---
 .../features/consumer/checkout_spec.rb        |  9 -------
 .../admin/bulk_order_management_spec.rb       |  9 -------
 .../admin/bulk_product_update_spec.rb         | 25 ++++++-------------
 spec/features/admin/enterprise_fees_spec.rb   |  9 -------
 spec/features/admin/enterprises_spec.rb       |  9 -------
 spec/features/admin/order_cycles_spec.rb      | 10 --------
 spec/spec_helper.rb                           |  2 ++
 7 files changed, 10 insertions(+), 63 deletions(-)

diff --git a/spec/archive/features/consumer/checkout_spec.rb b/spec/archive/features/consumer/checkout_spec.rb
index 525805eee5..9641085c39 100644
--- a/spec/archive/features/consumer/checkout_spec.rb
+++ b/spec/archive/features/consumer/checkout_spec.rb
@@ -8,15 +8,6 @@ feature %q{
   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
     set_feature_toggle :order_cycles, true
diff --git a/spec/features/admin/bulk_order_management_spec.rb b/spec/features/admin/bulk_order_management_spec.rb
index a56f669756..0039dfd3e1 100644
--- a/spec/features/admin/bulk_order_management_spec.rb
+++ b/spec/features/admin/bulk_order_management_spec.rb
@@ -7,15 +7,6 @@ feature %q{
   include AuthenticationWorkflow
   include WebHelper
 
-  before :all do
-    @default_wait_time = Capybara.default_wait_time
-    Capybara.default_wait_time = 10
-  end
-
-  after :all do
-    Capybara.default_wait_time = @default_wait_time
-  end
-
   context "listing orders" do
     before :each do
       login_to_admin_section
diff --git a/spec/features/admin/bulk_product_update_spec.rb b/spec/features/admin/bulk_product_update_spec.rb
index 0c8d81bd5c..8006b311a5 100644
--- a/spec/features/admin/bulk_product_update_spec.rb
+++ b/spec/features/admin/bulk_product_update_spec.rb
@@ -7,15 +7,6 @@ feature %q{
   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
-
   describe "listing products" do
     before :each do
       login_to_admin_section
@@ -534,16 +525,16 @@ feature %q{
   end
 
   scenario "updating when no changes have been made" do
-    Capybara.default_wait_time = 2
-    FactoryGirl.create(:product, :name => "product 1")
-    FactoryGirl.create(:product, :name => "product 2")
-    login_to_admin_section
+    Capybara.using_wait_time(2) do
+      FactoryGirl.create(:product, :name => "product 1")
+      FactoryGirl.create(:product, :name => "product 2")
+      login_to_admin_section
 
-    visit '/admin/products/bulk_edit'
+      visit '/admin/products/bulk_edit'
 
-    click_button 'Update'
-    page.find("span#update-status-message").should have_content "No changes to update."
-    Capybara.default_wait_time = 5
+      click_button 'Update'
+      page.find("span#update-status-message").should have_content "No changes to update."
+    end
   end
 
   scenario "updating when a filter has been applied" do
diff --git a/spec/features/admin/enterprise_fees_spec.rb b/spec/features/admin/enterprise_fees_spec.rb
index 958aeea419..44f26deddd 100644
--- a/spec/features/admin/enterprise_fees_spec.rb
+++ b/spec/features/admin/enterprise_fees_spec.rb
@@ -7,15 +7,6 @@ feature %q{
   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, name: '$0.50 / kg', fee_type: 'packing')
     amount = fee.calculator.preferred_amount
diff --git a/spec/features/admin/enterprises_spec.rb b/spec/features/admin/enterprises_spec.rb
index 3bcce92be2..4fac8b4ba5 100644
--- a/spec/features/admin/enterprises_spec.rb
+++ b/spec/features/admin/enterprises_spec.rb
@@ -7,15 +7,6 @@ feature %q{
   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 enterprises" do
     s = create(:supplier_enterprise)
     d = create(:distributor_enterprise)
diff --git a/spec/features/admin/order_cycles_spec.rb b/spec/features/admin/order_cycles_spec.rb
index 2eff8508c7..9ee0ff5ff0 100644
--- a/spec/features/admin/order_cycles_spec.rb
+++ b/spec/features/admin/order_cycles_spec.rb
@@ -7,16 +7,6 @@ feature %q{
   include AuthenticationWorkflow
   include WebHelper
 
-  before :all do
-    @orig_default_wait_time = Capybara.default_wait_time
-    Capybara.default_wait_time = 10
-  end
-
-  after :all do
-    Capybara.default_wait_time = @orig_default_wait_time
-  end
-
-
   scenario "listing order cycles" do
     # Given some order cycles (created in an arbitrary order)
     oc4 = create(:simple_order_cycle, name: '4',
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6cf9229252..eff1867c4f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -45,6 +45,8 @@ Capybara.register_driver :poltergeist do |app|
   Capybara::Poltergeist::Driver.new(app, options)
 end
 
+Capybara.default_wait_time = 30
+
 
 require "paperclip/matchers"