summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-16 00:00:38 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-16 00:00:38 +0000
commit64d0dd1807c75be21a8f5bfe3a74b9230b5b8979 (patch)
treed54f73409eea6ec39a957adc6ca9206e0dd4e3bd
parent5fd88cdd93ecf44f0d7a3b35a6256bcfae1a8787 (diff)
parent7c61bdcf6f7383ad26ea5b2c59bc8bc72096a8e6 (diff)
downloadgitlab-ce-64d0dd1807c75be21a8f5bfe3a74b9230b5b8979.tar.gz
Merge branch 'fix-capybara-deprecation-warnings' into 'master'
Fix Capybara 2.6.2 deprecation warnings See merge request !3236
-rw-r--r--features/support/capybara.rb2
-rw-r--r--spec/support/capybara.rb2
-rw-r--r--spec/support/wait_for_ajax.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/features/support/capybara.rb b/features/support/capybara.rb
index f33379f76c9..fe9e39cf509 100644
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -9,7 +9,7 @@ Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768])
end
-Capybara.default_wait_time = timeout
+Capybara.default_max_wait_time = timeout
Capybara.ignore_hidden_elements = false
unless ENV['CI'] || ENV['CI_SERVER']
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
index 65d59e6813c..e1f90e17cce 100644
--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -10,7 +10,7 @@ Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768])
end
-Capybara.default_wait_time = timeout
+Capybara.default_max_wait_time = timeout
Capybara.ignore_hidden_elements = true
unless ENV['CI'] || ENV['CI_SERVER']
diff --git a/spec/support/wait_for_ajax.rb b/spec/support/wait_for_ajax.rb
index 692d219e9f1..b90fc112671 100644
--- a/spec/support/wait_for_ajax.rb
+++ b/spec/support/wait_for_ajax.rb
@@ -1,6 +1,6 @@
module WaitForAjax
def wait_for_ajax
- Timeout.timeout(Capybara.default_wait_time) do
+ Timeout.timeout(Capybara.default_max_wait_time) do
loop until finished_all_ajax_requests?
end
end