X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/783b5e3729228908d7404ae7404af1023501a906..3666b674330ec8d14a224932a191d6121c5974e2:/test/application_system_test_case.rb diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index 96406b5a3..410fe578a 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -4,7 +4,7 @@ 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 @@ -13,12 +13,6 @@ end class ApplicationSystemTestCase < ActionDispatch::SystemTestCase 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