diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 09:13:33 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-03 09:13:33 +0300 |
| commit | a54bef0a4200d8323bb18e8d11481ef7bd63d314 (patch) | |
| tree | b0cc49126d6de01bbcecde47886b81ffb59cb123 /features | |
| parent | fc72f8e37ccb447131ee1492c147cef9add83581 (diff) | |
| parent | 3351f15af63929caec03c8dd0d62f52b8f7704eb (diff) | |
| download | gitlab-ce-a54bef0a4200d8323bb18e8d11481ef7bd63d314.tar.gz | |
Merge pull request #6943 from jvanbaarsen/spec-fix
Fix for failing specs
Diffstat (limited to 'features')
| -rw-r--r-- | features/support/env.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/features/support/env.rb b/features/support/env.rb index a5b297775db..3ab2ce0a3e6 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -28,7 +28,7 @@ WebMock.allow_net_connect! require 'capybara/poltergeist' Capybara.javascript_driver = :poltergeist Capybara.register_driver :poltergeist do |app| - Capybara::Poltergeist::Driver.new(app, :js_errors => false, :timeout => 60) + Capybara::Poltergeist::Driver.new(app, js_errors: false, timeout: 90) end Spinach.hooks.on_tag("javascript") do ::Capybara.current_driver = ::Capybara.javascript_driver |