Avoid accidental locale changes in tests

diff --git a/test/integration/page_locale_test.rb b/test/integration/page_locale_test.rb
index c8e5026d452d113802ed369a03f8131aa19d0a53..6f6d7779fc3ab420cb5f5a670254c3f2c5b523cc 100644 (file)
--- a/test/integration/page_locale_test.rb
+++ b/test/integration/page_locale_test.rb
@@ -2,40 +2,44 @@ require "test_helper"
 
 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_empty User.find(user.id).languages
-    assert_select "html[lang=?]", "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"
+    I18n.with_locale "en" do
+      user = create(:user, :languages => [])
+
+      get "/login"
+      follow_redirect!
+      post "/login", :params => { :username => user.email, :password => "test" }
+      follow_redirect!
+
+      get "/diary/new"
+      assert_empty User.find(user.id).languages
+      assert_select "html[lang=?]", "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
   end
 
   def test_override
-    user = create(:user, :languages => ["de"])
+    I18n.with_locale "en" do
+      user = create(:user, :languages => ["de"])
 
-    get "/diary"
-    assert_select "html[lang=?]", "en"
+      get "/diary"
+      assert_select "html[lang=?]", "en"
 
-    get "/diary", :params => { :locale => "es" }
-    assert_select "html[lang=?]", "es"
+      get "/diary", :params => { :locale => "es" }
+      assert_select "html[lang=?]", "es"
 
-    get "/login"
-    follow_redirect!
-    post "/login", :params => { :username => user.email, :password => "test" }
-    follow_redirect!
+      get "/login"
+      follow_redirect!
+      post "/login", :params => { :username => user.email, :password => "test" }
+      follow_redirect!
 
-    get "/diary"
-    assert_select "html[lang=?]", "de"
+      get "/diary"
+      assert_select "html[lang=?]", "de"
 
-    get "/diary", :params => { :locale => "fr" }
-    assert_select "html[lang=?]", "fr"
+      get "/diary", :params => { :locale => "fr" }
+      assert_select "html[lang=?]", "fr"
+    end
   end
 end

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index 82a17fdff6c978bbe10af48e7be900889b8700fe..9343487f6d6c5f7c78d18f4ae276f35923e6ed36 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -18,138 +18,148 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   end
 
   def test_create_user_form
-    I18n.available_locales.each do |locale|
-      reset!
-      get "/user/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
-      follow_redirect!
-      assert_response :success
-      assert_template "users/new"
+    I18n.with_locale "en" do
+      I18n.available_locales.each do |locale|
+        reset!
+        get "/user/new", :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+        follow_redirect!
+        assert_response :success
+        assert_template "users/new"
+      end
     end
   end
 
   def test_user_create_submit_duplicate_email
-    Locale.available.each do |locale|
-      dup_email = create(:user).email
-      display_name = "#{locale}_new_tester"
-      assert_difference("User.count", 0) do
-        assert_difference("ActionMailer::Base.deliveries.size", 0) do
-          perform_enqueued_jobs do
-            post "/user/new",
-                 :params => { :user => { :email => dup_email,
-                                         :email_confirmation => dup_email,
-                                         :display_name => display_name,
-                                         :pass_crypt => "testtest",
-                                         :pass_crypt_confirmation => "testtest" } },
-                 :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+    I18n.with_locale "en" do
+      Locale.available.each do |locale|
+        dup_email = create(:user).email
+        display_name = "#{locale}_new_tester"
+        assert_difference("User.count", 0) do
+          assert_difference("ActionMailer::Base.deliveries.size", 0) do
+            perform_enqueued_jobs do
+              post "/user/new",
+                   :params => { :user => { :email => dup_email,
+                                           :email_confirmation => dup_email,
+                                           :display_name => display_name,
+                                           :pass_crypt => "testtest",
+                                           :pass_crypt_confirmation => "testtest" } },
+                   :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+            end
           end
         end
+        assert_response :success
+        assert_template "users/new"
+        assert_equal locale.to_s, response.headers["Content-Language"]
+        assert_select "form"
+        assert_select "form > div.form-group > input.is-invalid#user_email"
+        assert_no_missing_translations
       end
-      assert_response :success
-      assert_template "users/new"
-      assert_equal locale.to_s, response.headers["Content-Language"]
-      assert_select "form"
-      assert_select "form > div.form-group > input.is-invalid#user_email"
-      assert_no_missing_translations
     end
   end
 
   def test_user_create_submit_duplicate_username
-    I18n.available_locales.each do |locale|
-      dup_display_name = create(:user).display_name
-      email = "#{locale}_new_tester"
-      assert_difference("User.count", 0) do
-        assert_difference("ActionMailer::Base.deliveries.size", 0) do
-          perform_enqueued_jobs do
-            post "/user/new",
-                 :params => { :user => { :email => email,
-                                         :email_confirmation => email,
-                                         :display_name => dup_display_name,
-                                         :pass_crypt => "testtest",
-                                         :pass_crypt_confirmation => "testtest" } },
-                 :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+    I18n.with_locale "en" do
+      I18n.available_locales.each do |locale|
+        dup_display_name = create(:user).display_name
+        email = "#{locale}_new_tester"
+        assert_difference("User.count", 0) do
+          assert_difference("ActionMailer::Base.deliveries.size", 0) do
+            perform_enqueued_jobs do
+              post "/user/new",
+                   :params => { :user => { :email => email,
+                                           :email_confirmation => email,
+                                           :display_name => dup_display_name,
+                                           :pass_crypt => "testtest",
+                                           :pass_crypt_confirmation => "testtest" } },
+                   :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+            end
           end
         end
+        assert_response :success
+        assert_template "users/new"
+        assert_select "form > div.form-group > input.is-invalid#user_display_name"
+        assert_no_missing_translations
       end
-      assert_response :success
-      assert_template "users/new"
-      assert_select "form > div.form-group > input.is-invalid#user_display_name"
-      assert_no_missing_translations
     end
   end
 
   def test_user_create_success
-    I18n.available_locales.each do |locale|
-      new_email = "#{locale}newtester@osm.org"
-      display_name = "#{locale}_new_tester"
-
-      assert_difference("User.count", 0) do
-        assert_difference("ActionMailer::Base.deliveries.size", 0) do
-          perform_enqueued_jobs do
-            post "/user/new",
-                 :params => { :user => { :email => new_email,
-                                         :email_confirmation => new_email,
-                                         :display_name => display_name,
-                                         :pass_crypt => "testtest",
-                                         :pass_crypt_confirmation => "testtest" } }
+    I18n.with_locale "en" do
+      I18n.available_locales.each do |locale|
+        new_email = "#{locale}newtester@osm.org"
+        display_name = "#{locale}_new_tester"
+
+        assert_difference("User.count", 0) do
+          assert_difference("ActionMailer::Base.deliveries.size", 0) do
+            perform_enqueued_jobs do
+              post "/user/new",
+                   :params => { :user => { :email => new_email,
+                                           :email_confirmation => new_email,
+                                           :display_name => display_name,
+                                           :pass_crypt => "testtest",
+                                           :pass_crypt_confirmation => "testtest" } }
+            end
           end
         end
-      end
 
-      assert_redirected_to "/user/terms"
+        assert_redirected_to "/user/terms"
 
-      assert_difference("User.count") do
-        assert_difference("ActionMailer::Base.deliveries.size", 1) do
-          perform_enqueued_jobs do
-            post "/user/save",
-                 :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s },
-                 :params => { :read_ct => 1, :read_tou => 1 }
-            follow_redirect!
+        assert_difference("User.count") do
+          assert_difference("ActionMailer::Base.deliveries.size", 1) do
+            perform_enqueued_jobs do
+              post "/user/save",
+                   :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s },
+                   :params => { :read_ct => 1, :read_tou => 1 }
+              follow_redirect!
+            end
           end
         end
-      end
 
-      # Check the e-mail
-      register_email = ActionMailer::Base.deliveries.first
+        # Check the e-mail
+        register_email = ActionMailer::Base.deliveries.first
 
-      assert_equal register_email.to.first, new_email
-      # Check that the confirm account url is correct
-      assert_match(/#{@url}/, register_email.body.to_s)
+        assert_equal register_email.to.first, new_email
+        # Check that the confirm account url is correct
+        assert_match(/#{@url}/, register_email.body.to_s)
 
-      # Check the page
-      assert_response :success
-      assert_template "confirmations/confirm"
+        # Check the page
+        assert_response :success
+        assert_template "confirmations/confirm"
 
-      ActionMailer::Base.deliveries.clear
+        ActionMailer::Base.deliveries.clear
+      end
     end
   end
 
   def test_user_create_no_tou_failure
-    I18n.available_locales.each do |locale|
-      new_email = "#{locale}newtester@osm.org"
-      display_name = "#{locale}_new_tester"
-
-      assert_difference("User.count", 0) do
-        assert_difference("ActionMailer::Base.deliveries.size", 0) do
-          perform_enqueued_jobs do
-            post "/user/new",
-                 :params => { :user => { :email => new_email,
-                                         :email_confirmation => new_email,
-                                         :display_name => display_name,
-                                         :pass_crypt => "testtest",
-                                         :pass_crypt_confirmation => "testtest" } }
+    I18n.with_locale "en" do
+      I18n.available_locales.each do |locale|
+        new_email = "#{locale}newtester@osm.org"
+        display_name = "#{locale}_new_tester"
+
+        assert_difference("User.count", 0) do
+          assert_difference("ActionMailer::Base.deliveries.size", 0) do
+            perform_enqueued_jobs do
+              post "/user/new",
+                   :params => { :user => { :email => new_email,
+                                           :email_confirmation => new_email,
+                                           :display_name => display_name,
+                                           :pass_crypt => "testtest",
+                                           :pass_crypt_confirmation => "testtest" } }
+            end
           end
         end
-      end
-
-      assert_redirected_to "/user/terms"
 
-      perform_enqueued_jobs do
-        post "/user/save",
-             :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
         assert_redirected_to "/user/terms"
-      end
 
-      ActionMailer::Base.deliveries.clear
+        perform_enqueued_jobs do
+          post "/user/save",
+               :headers => { "HTTP_ACCEPT_LANGUAGE" => locale.to_s }
+          assert_redirected_to "/user/terms"
+        end
+
+        ActionMailer::Base.deliveries.clear
+      end
     end
   end