Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'features/support')
-rw-r--r--features/support/capybara.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index 9a2df74d7be..8c6f4233278 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -1,16 +1,19 @@
require 'spinach/capybara'
require 'capybara/poltergeist'
+# Give CI some extra time
+timeout = (ENV['CI'] || ENV['CI_SERVER']) ? 90 : 10
+
Capybara.javascript_driver = :poltergeist
Capybara.register_driver :poltergeist do |app|
- Capybara::Poltergeist::Driver.new(app, js_errors: false, timeout: 90)
+ Capybara::Poltergeist::Driver.new(app, js_errors: false, timeout: timeout)
end
Spinach.hooks.on_tag("javascript") do
Capybara.current_driver = Capybara.javascript_driver
end
-Capybara.default_wait_time = 60
+Capybara.default_wait_time = timeout
Capybara.ignore_hidden_elements = false
require 'capybara-screenshot/spinach'