]> git.openstreetmap.org Git - rails.git/blobdiff - test/application_system_test_case.rb
Copy trace fixture files, rather than symlinking
[rails.git] / test / application_system_test_case.rb
index f39fc8d1d4e05b19e609297d3888af1208d91154..581297313a0dcc7f23e1c1db7403595e80378785 100644 (file)
@@ -1,8 +1,6 @@
 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
@@ -13,11 +11,11 @@ ActiveSupport.on_load(:action_dispatch_system_test_case) do
 end
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
-  driven_by :poltergeist, :screen_size => [1400, 1400]
+  driven_by :poltergeist, :screen_size => [1400, 1400], :options => { :timeout => 120 }
 
-  def initialize(*args)
-    stub_request(:get, "http://api.hostip.info/country.php?ip=127.0.0.1")
-      .to_return(:status => 404)
-    super(*args)
+  # 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")
   end
 end