Localisation updates from https://translatewiki.net.

[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..410fe578a51a8483eb7cca6180a652615ebaf610 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -4,20 +4,14 @@ require "capybara/poltergeist"
 # 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?
+ENV["QT_QPA_PLATFORM"] = "offscreen" if IO.popen(["phantomjs", "--version"], :err => :close).read.empty?
 
 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, "https://api.hostip.info/country.php?ip=127.0.0.1")
-      .to_return(:status => 404)
-    super(*args)
-  end
+  driven_by :poltergeist, :screen_size => [1400, 1400], :options => { :timeout => 120 }
 
   # Phantomjs can pick up browser Accept-Language preferences from your desktop environment.
   # We don't want this to happen during the tests!