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

[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 9abc7aa708861fff56257afbde1ba3017c38a33f..0f46ad3ec3df946d66b18cbb23b8068b94d5c9f3 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -1,15 +1,20 @@
 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?
 
-class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+ActiveSupport.on_load(:action_dispatch_system_test_case) do
   ActionDispatch::SystemTesting::Server.silence_puma = true
+end
 
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :poltergeist, :screen_size => [1400, 1400]
 
   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