X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6b631f1e25533233fe8e323c7f6d657a2b1d8718..14f86dd57624fae9b4884754097d625e2c9d12f4:/test/application_system_test_case.rb diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index 60322763e..f6546a550 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -1,27 +1,13 @@ require "test_helper" -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.delete("http_proxy") 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 - - # 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") + driven_by :selenium, :using => :headless_firefox do |options| + options.add_preference("intl.accept_languages", "en") end end