Remove deprecated get_via_direct and post_via_redirect methods

[rails.git] / test / integration / page_locale_test.rb

diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb
index c95af86abd4d0823262fe2f295523f5dcc18d1b2..ac34274a4e763d8bf81f8db41ed77894431b73e6 100644 (file)
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class PageLocaleTest < ActionDispatch::IntegrationTest
-  fixtures :users
-
   def setup
     I18n.locale = "en"
     stub_hostip_requests
@@ -13,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"
@@ -35,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"