Merge branch 'master' into moderation

[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 c5e0d0ae3d0be8388704b1634822137eb9946a1d..9c42d9be760b993f420d2de5fa7493a8563e067a 100644 (file)
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -13,13 +13,14 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
   def test_defaulting
     user = create(:user, :languages => [])
 
-    post_via_redirect "/login", :username => user.email, :password => "test"
+    post "/login", :params => { :username => user.email, :password => "test" }
+    follow_redirect!
 
-    get "/diary/new", {}
+    get "/diary/new"
     assert_equal [], User.find(user.id).languages
     assert_select "html[lang=?]", "en"
 
-    get "/diary/new", {}, { "HTTP_ACCEPT_LANGUAGE" => "fr, en" }
+    get "/diary/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => "fr, en" }
     assert_equal %w[fr en], User.find(user.id).languages
     assert_select "html[lang=?]", "fr"
   end
@@ -30,15 +31,16 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
     get "/diary"
     assert_select "html[lang=?]", "en"
 
-    get "/diary", :locale => "es"
+    get "/diary", :params => { :locale => "es" }
     assert_select "html[lang=?]", "es"
 
-    post_via_redirect "/login", :username => user.email, :password => "test"
+    post "/login", :params => { :username => user.email, :password => "test" }
+    follow_redirect!
 
     get "/diary"
     assert_select "html[lang=?]", "de"
 
-    get "/diary", :locale => "fr"
+    get "/diary", :params => { :locale => "fr" }
     assert_select "html[lang=?]", "fr"
   end
 end