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 ac34274a4e763d8bf81f8db41ed77894431b73e6..b42865ae48c6f8c7867cee7c7de55a355ce6a617 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,14 +12,16 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
   def test_defaulting
     user = create(:user, :languages => [])
 
   def test_defaulting
     user = create(:user, :languages => [])
 

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

     follow_redirect!
 
     follow_redirect!
 

-    get "/diary/new", {}
-    assert_equal [], User.find(user.id).languages
+    get "/diary/new"
+    assert_empty User.find(user.id).languages

     assert_select "html[lang=?]", "en"
 
     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
     assert_equal %w[fr en], User.find(user.id).languages
     assert_select "html[lang=?]", "fr"
   end


@@ -31,16 +32,18 @@ class PageLocaleTest < ActionDispatch::IntegrationTest
     get "/diary"
     assert_select "html[lang=?]", "en"
 
     get "/diary"
     assert_select "html[lang=?]", "en"
 

-    get "/diary", :locale => "es"
+    get "/diary", :params => { :locale => "es" }

     assert_select "html[lang=?]", "es"
 
     assert_select "html[lang=?]", "es"
 

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

     follow_redirect!
 
     get "/diary"
     assert_select "html[lang=?]", "de"
 
     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
     assert_select "html[lang=?]", "fr"
   end
 end