Fix Rails/I18nLocaleAssignment cop (#24693)

.rubocop_todo.yml

@@ -1335,14 +1335,6 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/user.rb'
     - 'app/models/web/push_subscription.rb'
 
-# Configuration parameters: Include.
-# Include: spec/**/*.rb, test/**/*.rb
-Rails/I18nLocaleAssignment:
-  Exclude:
-    - 'spec/controllers/auth/registrations_controller_spec.rb'
-    - 'spec/helpers/application_helper_spec.rb'
-    - 'spec/requests/localization_spec.rb'
-
 Rails/I18nLocaleTexts:
   Exclude:
     - 'lib/tasks/mastodon.rake'

spec/controllers/auth/registrations_controller_spec.rb

@@ -104,9 +104,9 @@ RSpec.describe Auth::RegistrationsController, type: :controller do
     end
 
     around do |example|
-      current_locale = I18n.locale
+      I18n.with_locale(I18n.locale) do
-      example.run
+        example.run
-      I18n.locale = current_locale
+      end
     end
 
     before { request.env['devise.mapping'] = Devise.mappings[:user] }

spec/helpers/application_helper_spec.rb

@@ -44,30 +44,28 @@ describe ApplicationHelper do
   end
 
   describe 'locale_direction' do
-    around do |example|
-      current_locale = I18n.locale
-      example.run
-      I18n.locale = current_locale
-    end
-
     it 'adds rtl body class if locale is Arabic' do
-      I18n.locale = :ar
+      I18n.with_locale(:ar) do
-      expect(helper.locale_direction).to eq 'rtl'
+        expect(helper.locale_direction).to eq 'rtl'
+      end
     end
 
     it 'adds rtl body class if locale is Farsi' do
-      I18n.locale = :fa
+      I18n.with_locale(:fa) do
-      expect(helper.locale_direction).to eq 'rtl'
+        expect(helper.locale_direction).to eq 'rtl'
+      end
     end
 
     it 'adds rtl if locale is Hebrew' do
-      I18n.locale = :he
+      I18n.with_locale(:he) do
-      expect(helper.locale_direction).to eq 'rtl'
+        expect(helper.locale_direction).to eq 'rtl'
+      end
     end
 
     it 'does not add rtl if locale is Thai' do
-      I18n.locale = :th
+      I18n.with_locale(:th) do
-      expect(helper.locale_direction).to_not eq 'rtl'
+        expect(helper.locale_direction).to_not eq 'rtl'
+      end
     end
   end
 

spec/requests/localization_spec.rb

@@ -3,8 +3,10 @@
 require 'rails_helper'
 
 describe 'Localization' do
-  after(:all) do
+  around do |example|
-    I18n.locale = I18n.default_locale
+    I18n.with_locale(I18n.locale) do
+      example.run
+    end
   end
 
   it 'uses a specific region when provided' do