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 176f4903d4be6f4f6d75f55352fcc4ed3c10d5b8..96406b5a3c5fc58000e326ba0b16cdca17a09ecc 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -1,21 +1,27 @@
 require "test_helper"
 require "capybara/poltergeist"
 
 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
 ENV["QT_QPA_PLATFORM"] = "phantom" if IO.popen(["phantomjs", "--version"], :err => :close).read.empty?
 
 # Work around weird debian/ubuntu phantomjs
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817277
 # https://github.com/ariya/phantomjs/issues/14376
 ENV["QT_QPA_PLATFORM"] = "phantom" if IO.popen(["phantomjs", "--version"], :err => :close).read.empty?
 

-class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+ActiveSupport.on_load(:action_dispatch_system_test_case) do

   ActionDispatch::SystemTesting::Server.silence_puma = true
   ActionDispatch::SystemTesting::Server.silence_puma = true

+end

 
 

-  driven_by :poltergeist, :screen_size => [1400, 1400]
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  driven_by :poltergeist, :screen_size => [1400, 1400], :options => { :timeout => 120 }

 
   def initialize(*args)
 
   def initialize(*args)

-    stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
+    stub_request(:get, "https://api.hostip.info/country.php?ip=127.0.0.1")

       .to_return(:status => 404)
     super(*args)
   end
       .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
 end