Merge remote-tracking branch 'upstream/pull/2471'

[rails.git] / test / application_system_test_case.rb

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 60322763e133b329d8cfb4e23a018ba05b75cabb..96406b5a3c5fc58000e326ba0b16cdca17a09ecc 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -11,7 +11,7 @@ ActiveSupport.on_load(:action_dispatch_system_test_case) do
 end
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
 end
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase

-  driven_by :poltergeist, :screen_size => [1400, 1400]
+  driven_by :poltergeist, :screen_size => [1400, 1400], :options => { :timeout => 120 }

 
   def initialize(*args)
     stub_request(:get, "https://api.hostip.info/country.php?ip=127.0.0.1")
 
   def initialize(*args)
     stub_request(:get, "https://api.hostip.info/country.php?ip=127.0.0.1")