Merge branch 'pull/3091'

[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 9c42d9be760b993f420d2de5fa7493a8563e067a..239c1d847b20da20878d080def9a54ea5888f8d5 100644 (file)
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -3,7 +3,6 @@ require "test_helper"
 class PageLocaleTest < ActionDispatch::IntegrationTest
   def setup
     I18n.locale = "en"
 class PageLocaleTest < ActionDispatch::IntegrationTest
   def setup
     I18n.locale = "en"

-    stub_hostip_requests

   end
 
   def teardown
   end
 
   def teardown


@@ -13,6 +12,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
   def test_defaulting
     user = create(:user, :languages => [])
 
   def test_defaulting
     user = create(:user, :languages => [])
 

+    get "/login"
+    follow_redirect!

     post "/login", :params => { :username => user.email, :password => "test" }
     follow_redirect!
 
     post "/login", :params => { :username => user.email, :password => "test" }
     follow_redirect!
 


@@ -34,6 +35,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
     get "/diary", :params => { :locale => "es" }
     assert_select "html[lang=?]", "es"
 
     get "/diary", :params => { :locale => "es" }
     assert_select "html[lang=?]", "es"
 

+    get "/login"
+    follow_redirect!

     post "/login", :params => { :username => user.email, :password => "test" }
     follow_redirect!
 
     post "/login", :params => { :username => user.email, :password => "test" }
     follow_redirect!