X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/945ff7911ca51dc250ffaba71f62821b5c0c0a95..07673278f13c87fd2e073b041970bbdd45eebe86:/test/integration/page_locale_test.rb

diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb
index 43810db99..ac34274a4 100644
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -1,10 +1,9 @@
 require "test_helper"
 
 class PageLocaleTest < ActionDispatch::IntegrationTest
-  fixtures :users
-
   def setup
     I18n.locale = "en"
+    stub_hostip_requests
   end
 
   def teardown
@@ -12,21 +11,22 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
   end
 
   def test_defaulting
-    user = users(:second_public_user)
+    user = create(:user, :languages => [])
 
-    post_via_redirect "/login", :username => user.email, :password => "test"
+    post "/login", :username => user.email, :password => "test"
+    follow_redirect!
 
     get "/diary/new", {}
     assert_equal [], User.find(user.id).languages
     assert_select "html[lang=?]", "en"
 
     get "/diary/new", {}, { "HTTP_ACCEPT_LANGUAGE" => "fr, en" }
-    assert_equal %w(fr en), User.find(user.id).languages
+    assert_equal %w[fr en], User.find(user.id).languages
     assert_select "html[lang=?]", "fr"
   end
 
   def test_override
-    user = users(:german_user)
+    user = create(:user, :languages => ["de"])
 
     get "/diary"
     assert_select "html[lang=?]", "en"
@@ -34,7 +34,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
     get "/diary", :locale => "es"
     assert_select "html[lang=?]", "es"
 
-    post_via_redirect "/login", :username => user.email, :password => "test"
+    post "/login", :username => user.email, :password => "test"
+    follow_redirect!
 
     get "/diary"
     assert_select "html[lang=?]", "de"