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 43810db997885e1815ab20d2d668869649bc322c..ac34274a4e763d8bf81f8db41ed77894431b73e6 100644 (file)
--- 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
 require "test_helper"
 
 class PageLocaleTest < ActionDispatch::IntegrationTest

-  fixtures :users
-

   def setup
     I18n.locale = "en"
   def setup
     I18n.locale = "en"

+    stub_hostip_requests

   end
 
   def teardown
   end
 
   def teardown


@@ -12,21 +11,22 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
   end
 
   def test_defaulting
   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" }
 
     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
     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"
 
     get "/diary"
     assert_select "html[lang=?]", "en"


@@ -34,7 +34,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
     get "/diary", :locale => "es"
     assert_select "html[lang=?]", "es"
 
     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"
 
     get "/diary"
     assert_select "html[lang=?]", "de"