diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-06-05 20:21:28 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2014-06-05 20:21:28 +0200 |
| commit | 2545b0f85851d1e4ebc1137a2c8786a238e02ee4 (patch) | |
| tree | 21a69bc5fb3e8e24d95c41618d1ef5a5be63e70d /features/support | |
| parent | a76bf07ae2ecaf47dab58cbeac37cb82ae8d3ad8 (diff) | |
| download | gitlab-ce-2545b0f85851d1e4ebc1137a2c8786a238e02ee4.tar.gz | |
Revert "Fix for failing specs"
This reverts commit 2314438925af827b694fbaaf59c31c49dd2c0c31.
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Conflicts:
Gemfile.lock
Diffstat (limited to 'features/support')
| -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 3ab2ce0a3e6..a5b297775db 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: 90) + Capybara::Poltergeist::Driver.new(app, :js_errors => false, :timeout => 60) end Spinach.hooks.on_tag("javascript") do ::Capybara.current_driver = ::Capybara.javascript_driver |