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

[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 5b66f580ef800bd47d385ced1f1007d1653745cc..96406b5a3c5fc58000e326ba0b16cdca17a09ecc 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 require "capybara/poltergeist"
 
-WebMock.disable_net_connect!(:allow_localhost => true)
-
 # Work around weird debian/ubuntu phantomjs
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817277
 # https://github.com/ariya/phantomjs/issues/14376
@@ -13,11 +11,17 @@ ActiveSupport.on_load(:action_dispatch_system_test_case) do
 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")
       .to_return(:status => 404)
     super(*args)
   end
+
+  # Phantomjs can pick up browser Accept-Language preferences from your desktop environment.
+  # We don't want this to happen during the tests!
+  setup do
+    page.driver.add_headers("Accept-Language" => "en")
+  end
 end