X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/98de681e4711ad3bf5526e511002c8f0e91860a8..85b17a1f2a69784fc85fb0101fd339cdcfdad105:/test/application_system_test_case.rb?ds=sidebyside diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb index f39fc8d1d..f6546a550 100644 --- a/test/application_system_test_case.rb +++ b/test/application_system_test_case.rb @@ -1,23 +1,13 @@ 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? +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, "http://api.hostip.info/country.php?ip=127.0.0.1") - .to_return(:status => 404) - super(*args) + driven_by :selenium, :using => :headless_firefox do |options| + options.add_preference("intl.accept_languages", "en") end end