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

Fix Capybara 2.6.2 deprecation warnings See merge request !3236

Merge branch 'fix-capybara-deprecation-warnings' into 'master'
Fix Capybara 2.6.2 deprecation warnings See merge request !3236
64d0dd18 · Robert Speicher · 5fd88cdd · 7c61bdcf · 64d0dd18 · 64d0dd18
--- a/features/support/capybara.rb
+++ b/features/support/capybara.rb
@@ -9,7 +9,7 @@
  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']

--- a/spec/support/capybara.rb
+++ b/spec/support/capybara.rb
@@ -10,7 +10,7 @@
  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']

--- a/spec/support/wait_for_ajax.rb
+++ b/spec/support/wait_for_ajax.rb
 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