X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ca5de5b4e01297b07ce3a9db45e908f15f7cda11..124ec2e9d560e0df291e5a8e5aa67ef5db2f5d46:/test/integration/page_locale_test.rb diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb index 43810db99..c5e0d0ae3 100644 --- a/test/integration/page_locale_test.rb +++ b/test/integration/page_locale_test.rb @@ -1,10 +1,9 @@ require "test_helper" class PageLocaleTest < ActionDispatch::IntegrationTest - fixtures :users - def setup I18n.locale = "en" + stub_hostip_requests end def teardown @@ -12,7 +11,7 @@ class PageLocaleTest < ActionDispatch::IntegrationTest end def test_defaulting - user = users(:second_public_user) + user = create(:user, :languages => []) post_via_redirect "/login", :username => user.email, :password => "test" @@ -21,12 +20,12 @@ class PageLocaleTest < ActionDispatch::IntegrationTest assert_select "html[lang=?]", "en" get "/diary/new", {}, { "HTTP_ACCEPT_LANGUAGE" => "fr, en" } - assert_equal %w(fr en), User.find(user.id).languages + assert_equal %w[fr en], User.find(user.id).languages assert_select "html[lang=?]", "fr" end def test_override - user = users(:german_user) + user = create(:user, :languages => ["de"]) get "/diary" assert_select "html[lang=?]", "en"