X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b690feba15905eaddc451560f0f1379b5f19b511..5cc4e933479b7e74ed7d4425909f0915717fc1db:/test/integration/page_locale_test.rb diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb index fffe83acc..2c4939b05 100644 --- 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" - stub_hostip_requests end def teardown @@ -13,14 +12,15 @@ class PageLocaleTest < ActionDispatch::IntegrationTest def test_defaulting user = create(:user, :languages => []) - post_via_redirect "/login", :username => user.email, :password => "test" + post "/login", :params => { :username => user.email, :password => "test" } + follow_redirect! - get "/diary/new", {} + 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 + 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 @@ -30,15 +30,16 @@ class PageLocaleTest < ActionDispatch::IntegrationTest get "/diary" assert_select "html[lang=?]", "en" - get "/diary", :locale => "es" + get "/diary", :params => { :locale => "es" } assert_select "html[lang=?]", "es" - post_via_redirect "/login", :username => user.email, :password => "test" + post "/login", :params => { :username => user.email, :password => "test" } + 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