Merge branch 'master' of github.com:OWASP/railsgoat

2014-03-15 14:20:41 -04:00
parent 7a4efaa950 31a4cc779f
commit ed73ab47e7
2 changed files with 27 additions and 23 deletions
@@ -76,7 +76,7 @@ class WarningSuppressor
 end

 Capybara.register_driver :poltergeist do |app|
-  Capybara::Poltergeist::Driver.new(app, phantomjs_logger: WarningSuppressor)
+  Capybara::Poltergeist::Driver.new(app, phantomjs_logger: WarningSuppressor, timeout: 60)
 end

 Capybara.javascript_driver = :poltergeist