X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/be35d4ab9cfc7e18df1b3d4f2d58d8aea1eb8f4c..44d9b77f7a2f48c6cea251b5e97a775598dee4fc:/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 9abc7aa70..b170e74b1 100644
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -1,16 +1,30 @@
 require "test_helper"
-require "capybara/poltergeist"
 
-WebMock.disable_net_connect!(:allow_localhost => true)
+ENV.delete("http_proxy")
 
-class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+ActiveSupport.on_load(:action_dispatch_system_test_case) do
   ActionDispatch::SystemTesting::Server.silence_puma = true
+end
+
+class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
+  driven_by :selenium, :using => :headless_firefox do |options|
+    options.add_preference("intl.accept_languages", "en")
+  end
+
+  def before_setup
+    super
+    osm_website_app = create(:oauth_application, :name => "OpenStreetMap Web Site", :scopes => "write_api write_notes")
+    Settings.oauth_application = osm_website_app.uid
+  end
+
+  def after_teardown
+    Settings.reload!
+    super
+  end
 
-  driven_by :poltergeist, :screen_size => [1400, 1400]
+  private
 
-  def initialize(*args)
-    stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
-      .to_return(:status => 404)
-    super(*args)
+  def within_sidebar(&block)
+    within "#sidebar_content", &block
   end
 end