From cac4b1ba4eca451922050369e118fe523fc19bc1 Mon Sep 17 00:00:00 2001 From: Sarah Mei Date: Mon, 5 Sep 2011 12:08:29 -0700 Subject: [PATCH] Ridiculously long cucumber timeout so we're more resiliant to travis traffic --- features/step_definitions/custom_web_steps.rb | 8 ++++---- features/support/env.rb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/features/step_definitions/custom_web_steps.rb b/features/step_definitions/custom_web_steps.rb index ef776aaaf..f469ff31c 100644 --- a/features/step_definitions/custom_web_steps.rb +++ b/features/step_definitions/custom_web_steps.rb @@ -112,7 +112,7 @@ Then /^(?:|I )should not see a "([^\"]*)"(?: within "([^\"]*)")?$/ do |selector, end When /^I wait for the ajax to finish$/ do - wait_until(10) { evaluate_script("$.active") == 0 } + wait_until(30) { evaluate_script("$.active") == 0 } end When /^I have turned off jQuery effects$/ do @@ -162,17 +162,17 @@ Then /^the "([^"]*)" field(?: within "([^"]*)")? should be filled with "([^"]*)" end Then /^I should see (\d+) posts$/ do |n_posts| - wait_until(10) { all("#main_stream .stream_element").length == n_posts.to_i } + wait_until(30) { all("#main_stream .stream_element").length == n_posts.to_i } end Then /^I should see (\d+) contacts$/ do |n_posts| - wait_until(10) { all("#people_stream .stream_element").length == n_posts.to_i } + wait_until(30) { all("#people_stream .stream_element").length == n_posts.to_i } end And /^I scroll down$/ do evaluate_script("window.scrollBy(0,3000000)") sleep 1 - wait_until(10) { evaluate_script('$("#infscr-loading:visible").length') == 0 } + wait_until(30) { evaluate_script('$("#infscr-loading:visible").length') == 0 } end Then /^the notification dropdown should be visible$/ do diff --git a/features/support/env.rb b/features/support/env.rb index 1116d9387..ac91b0665 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -22,8 +22,8 @@ require 'cucumber/rails/capybara_javascript_emulation' # Lets you click links wi # steps to use the XPath syntax. Capybara.default_selector = :css -# We have a higher default wait time to account for build machines of various beefiness. -Capybara.default_wait_time = 10 +# We have a ridiculously high wait time to account for build machines of various beefiness. +Capybara.default_wait_time = 30 # If you set this to false, any error raised from within your app will bubble # up to your step definition and out to cucumber unless you catch it somewhere