From 36cde6bc516e10d237444083960ba0691bc253f1 Mon Sep 17 00:00:00 2001 From: Katsuya HIDAKA Date: Sat, 23 May 2026 02:56:30 +0900 Subject: Fix flaky tests caused by locale leakage --- test/test_helper.rb | 6 ++++++ test/unit/lib/redmine/i18n_test.rb | 4 ---- .../common_mark/alerts_icons_scrubber_test.rb | 4 ---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 02f0070f4..2c939a352 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -61,6 +61,12 @@ class ActiveSupport::TestCase self.use_transactional_tests = true self.use_instantiated_fixtures = false + setup do + # Tests mutate the process-global locale; reset it so test order does not + # affect translated assertions in later tests run by the same worker. + ::I18n.locale = ::I18n.default_locale + end + parallelize_setup do |worker| # Use a separate attachment directory for each worker. $redmine_tmp_attachments_directory = diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb index 72643b9e6..9c8fab62b 100644 --- a/test/unit/lib/redmine/i18n_test.rb +++ b/test/unit/lib/redmine/i18n_test.rb @@ -27,10 +27,6 @@ class Redmine::I18nTest < ActiveSupport::TestCase User.current = nil end - def teardown - set_language_if_valid 'en' - end - def test_date_format_default set_language_if_valid 'en' today = Date.today diff --git a/test/unit/lib/redmine/wiki_formatting/common_mark/alerts_icons_scrubber_test.rb b/test/unit/lib/redmine/wiki_formatting/common_mark/alerts_icons_scrubber_test.rb index c149daf63..96135b5ac 100644 --- a/test/unit/lib/redmine/wiki_formatting/common_mark/alerts_icons_scrubber_test.rb +++ b/test/unit/lib/redmine/wiki_formatting/common_mark/alerts_icons_scrubber_test.rb @@ -40,10 +40,6 @@ if Object.const_defined?(:Commonmarker) @options = { } end - def teardown - set_language_if_valid 'en' - end - def test_should_render_alert_blocks_with_localized_labels set_language_if_valid 'de' text = <<~MD -- 2.52.0