Fix new ruboop warnings

[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..c8e5026d452d113802ed369a03f8131aa19d0a53 100644 (file)
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -1,23 +1,16 @@
 require "test_helper"
 
 class PageLocaleTest < ActionDispatch::IntegrationTest
-  def setup
-    I18n.locale = "en"
-    stub_hostip_requests
-  end
-
-  def teardown
-    I18n.locale = "en"
-  end
-
   def test_defaulting
     user = create(:user, :languages => [])
 
+    get "/login"
+    follow_redirect!
     post "/login", :params => { :username => user.email, :password => "test" }
     follow_redirect!
 
     get "/diary/new"
-    assert_equal [], User.find(user.id).languages
+    assert_empty User.find(user.id).languages
     assert_select "html[lang=?]", "en"
 
     get "/diary/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => "fr, en" }
@@ -34,6 +27,8 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
     get "/diary", :params => { :locale => "es" }
     assert_select "html[lang=?]", "es"
 
+    get "/login"
+    follow_redirect!
     post "/login", :params => { :username => user.email, :password => "test" }
     follow_redirect!