Copy trace fixture files, rather than symlinking

[rails.git] / test / application_system_test_case.rb

diff --git a/test/application_system_test_case.rb b/test/application_system_test_case.rb
index 0f46ad3ec3df946d66b18cbb23b8068b94d5c9f3..581297313a0dcc7f23e1c1db7403595e80378785 100644 (file)
--- a/test/application_system_test_case.rb
+++ b/test/application_system_test_case.rb
@@ -11,11 +11,11 @@ ActiveSupport.on_load(:action_dispatch_system_test_case) do
 end
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
 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, "https://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
   end
 end