diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-16 00:00:38 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-16 00:00:38 +0000 |
| commit | 64d0dd1807c75be21a8f5bfe3a74b9230b5b8979 (patch) | |
| tree | d54f73409eea6ec39a957adc6ca9206e0dd4e3bd /features | |
| parent | 5fd88cdd93ecf44f0d7a3b35a6256bcfae1a8787 (diff) | |
| parent | 7c61bdcf6f7383ad26ea5b2c59bc8bc72096a8e6 (diff) | |
| download | gitlab-ce-64d0dd1807c75be21a8f5bfe3a74b9230b5b8979.tar.gz | |
Merge branch 'fix-capybara-deprecation-warnings' into 'master'
Fix Capybara 2.6.2 deprecation warnings
See merge request !3236
Diffstat (limited to 'features')
| -rw-r--r-- | features/support/capybara.rb | 2 |
1 files changed, 1 insertions, 1 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'] |