summaryrefslogtreecommitdiff
path: root/features/support
diff options
context:
space:
mode:
authorJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-05-08 19:15:58 +0200
committerJeroen van Baarsen <jeroenvanbaarsen@gmail.com>2014-05-30 23:19:50 +0200
commit2314438925af827b694fbaaf59c31c49dd2c0c31 (patch)
treed3c49a849926d88ff963a98dcb8a9e6597b85f19 /features/support
parentd54d3324b1ae46a60712dbb974214e41fca5b93b (diff)
downloadgitlab-ce-2314438925af827b694fbaaf59c31c49dd2c0c31.tar.gz
Fix for failing specs
Diffstat (limited to 'features/support')
-rw-r--r--features/support/env.rb2
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