A platform for community discussion. Free, open, simple.
DEV: Automatically detect and revert translation overrides in specs (#40003)
Jarek Radosz388c709df4b7
diff --git a/plugins/discourse-ai/spec/requests/admin/ai_agents_controller_spec.rb b/plugins/discourse-ai/spec/requests/admin/ai_agents_controller_spec.rbindex ddca31574ec..61ee4178868 100644--- a/plugins/discourse-ai/spec/requests/admin/ai_agents_controller_spec.rb+++ b/plugins/discourse-ai/spec/requests/admin/ai_agents_controller_spec.rb@@ -204,17 +204,6 @@ RSpec.describe DiscourseAi::Admin::AiAgentsController do)end- after do- TranslationOverride.revert!(- SiteSetting.default_locale,- "discourse_ai.ai_bot.agents.general.name",- )- TranslationOverride.revert!(- SiteSetting.default_locale,- "discourse_ai.ai_bot.agents.general.description",- )- end-it "returns localized agent names and descriptions" doget "/admin/plugins/discourse-ai/ai-agents.json"diff --git a/spec/integration/email_style_spec.rb b/spec/integration/email_style_spec.rbindex 30e79c3a491..3f753bfc2e7 100644--- a/spec/integration/email_style_spec.rb+++ b/spec/integration/email_style_spec.rb@@ -99,13 +99,6 @@ RSpec.describe EmailStyle do)end- after do- TranslationOverride.revert!(- SiteSetting.default_locale,- ["user_notifications.signup.text_body_template"],- )- end-it "applies customizations when translation override exists" doexpect(mail_html.scan('<h1 style="color:red">FOR YOU</h1>').count).to eq(1)expect(mail_html.scan("CLICK THAT LINK").count).to eq(1)diff --git a/spec/jobs/regular/bulk_user_title_update_spec.rb b/spec/jobs/regular/bulk_user_title_update_spec.rbindex 1aa49edc2d3..a8219a9801f 100644--- a/spec/jobs/regular/bulk_user_title_update_spec.rb+++ b/spec/jobs/regular/bulk_user_title_update_spec.rb@@ -48,7 +48,5 @@ RSpec.describe Jobs::BulkUserTitleUpdate dodescribed_class.new.execute(granted_badge_id: badge.id, action: described_class::RESET_ACTION)expect(user.reload.title).to eq("Protector of the Realm")end-- after { TranslationOverride.revert!(I18n.locale, Badge.i18n_key(badge.name)) }endenddiff --git a/spec/mailers/user_notifications_spec.rb b/spec/mailers/user_notifications_spec.rbindex f3defcb2559..425635a3329 100644--- a/spec/mailers/user_notifications_spec.rb+++ b/spec/mailers/user_notifications_spec.rb@@ -724,11 +724,6 @@ RSpec.describe UserNotifications doexpect(body).not_to include("%{optional_cat}")expect(body).not_to include("%{optional_pm}")expect(body).not_to include("%{optional_re}")-- TranslationOverride.revert!(- I18n.locale,- ["user_notifications.user_replied.text_body_template"],- )endenddiff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rbindex 638454a18df..1fb1f4454d1 100644--- a/spec/models/user_spec.rb+++ b/spec/models/user_spec.rb@@ -3046,8 +3046,6 @@ RSpec.describe User douser.update!(title: customized_badge_name)expect(user.user_profile.reload.granted_title_badge_id).to eq(badge.id)end-- after { TranslationOverride.revert!(I18n.locale, Badge.i18n_key(badge.name)) }endenddiff --git a/spec/rails_helper.rb b/spec/rails_helper.rbindex fc0581eac05..bea2686e975 100644--- a/spec/rails_helper.rb+++ b/spec/rails_helper.rb@@ -185,6 +185,11 @@ module TestSetupI18n.locale = SiteSettings::DefaultsProvider::DEFAULT_LOCALE+ # Database is rolled back between specs, but I18n override cache doesn't.+ # Flush it if there were any TranslationOverrides created.+ overrides_by_site = I18n.instance_variable_get(:@overrides_by_site) || {}+ I18n.reload! if overrides_by_site.values.flat_map(&:values).any?(&:any?)+RspecErrorTracker.clear_exceptionsif $test_cleanup_callbacksdiff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex af276a6c700..154e9b29db6 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -3485,8 +3485,6 @@ RSpec.describe UsersController doTranslationOverride.upsert!("en", "badges.demogorgon.name", "Boss")end- after { TranslationOverride.revert!("en", ["badges.demogorgon.name"]) }-it "uses the badge display name as user title" dosign_in(user1)diff --git a/spec/services/badge_granter_spec.rb b/spec/services/badge_granter_spec.rbindex f5f09ebf162..e274818a70e 100644--- a/spec/services/badge_granter_spec.rb+++ b/spec/services/badge_granter_spec.rb@@ -527,8 +527,6 @@ RSpec.describe BadgeGranter do).to be_emptyexpect(user.reload.title).to eq(nil)end-- after { TranslationOverride.revert!(I18n.locale, Badge.i18n_key(badge.name)) }endend