Rework sidebar to use padding on the sidebar_content div

[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 2c4939b054fddf456565505dbd48802e4215c4f1..b42865ae48c6f8c7867cee7c7de55a355ce6a617 100644 (file)
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -12,11 +12,13 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
   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" }
@@ -33,6 +35,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!