diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-03-15 11:03:17 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-03-15 11:03:17 -0700 |
| commit | 7c61bdcf6f7383ad26ea5b2c59bc8bc72096a8e6 (patch) | |
| tree | 5cad77222a2e404aa42f144cd771710a2e2577e9 /spec | |
| parent | ac8c6f24e3070c28ab6f246599c95fd8f3b7e3a5 (diff) | |
| download | gitlab-ce-7c61bdcf6f7383ad26ea5b2c59bc8bc72096a8e6.tar.gz | |
Fix Capybara 2.6.2 deprecation warnings
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/capybara.rb | 2 | ||||
| -rw-r--r-- | spec/support/wait_for_ajax.rb | 2 |
2 files changed, 2 insertions, 2 deletions
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 |