Commit 64d0dd18 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'fix-capybara-deprecation-warnings' into 'master'

Fix Capybara 2.6.2 deprecation warnings

See merge request !3236
parents 5fd88cdd 7c61bdcf
...@@ -9,7 +9,7 @@ Capybara.register_driver :poltergeist do |app| ...@@ -9,7 +9,7 @@ Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768]) Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768])
end end
Capybara.default_wait_time = timeout Capybara.default_max_wait_time = timeout
Capybara.ignore_hidden_elements = false Capybara.ignore_hidden_elements = false
unless ENV['CI'] || ENV['CI_SERVER'] unless ENV['CI'] || ENV['CI_SERVER']
......
...@@ -10,7 +10,7 @@ Capybara.register_driver :poltergeist do |app| ...@@ -10,7 +10,7 @@ Capybara.register_driver :poltergeist do |app|
Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768]) Capybara::Poltergeist::Driver.new(app, js_errors: true, timeout: timeout, window_size: [1366, 768])
end end
Capybara.default_wait_time = timeout Capybara.default_max_wait_time = timeout
Capybara.ignore_hidden_elements = true Capybara.ignore_hidden_elements = true
unless ENV['CI'] || ENV['CI_SERVER'] unless ENV['CI'] || ENV['CI_SERVER']
......
module WaitForAjax module WaitForAjax
def wait_for_ajax 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? loop until finished_all_ajax_requests?
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment