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

[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..f6546a550d6cb4ade8238ba75bda6364752e6e60 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -1,21 +1,13 @@
 require "test_helper"
 require "test_helper"

-require "capybara/poltergeist"

 
 

-WebMock.disable_net_connect!(:allow_localhost => true)
+ENV.delete("http_proxy")

 
 

-# 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]
-
-  def initialize(*args)
-    stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
-      .to_return(:status => 404)
-    super(*args)
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  driven_by :selenium, :using => :headless_firefox do |options|
+    options.add_preference("intl.accept_languages", "en")

   end
 end
   end
 end