From: Go MAEDA <maeda@farend.jp>
Date: Sat, 22 Jan 2022 09:16:19 +0000 (+0000)
Subject: Fix that I18nTest#test_custom_pluralization_rules randomly fails (#36396, #36461).
X-Git-Tag: 5.0.0~93
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=8c147ca2b1cee4e707035a5d526b11c9a91e8bcc;p=redmine.git

Fix that I18nTest#test_custom_pluralization_rules randomly fails (#36396, #36461).

Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@21382 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/unit/lib/redmine/i18n_test.rb b/test/unit/lib/redmine/i18n_test.rb
index 4e15ae56b..f6e7a804d 100644
--- a/test/unit/lib/redmine/i18n_test.rb
+++ b/test/unit/lib/redmine/i18n_test.rb
@@ -257,11 +257,13 @@ class Redmine::I18nTest < ActiveSupport::TestCase
   end
 
   def test_custom_pluralization_rules
+    pluralizers = I18n.backend.instance_variable_get(:@pluralizers)
+    I18n.backend.instance_variable_set(:@pluralizers, nil)
     I18n.backend.store_translations :pt, i18n: {plural: {rule: ->(n) {[0, 1].include?(n) ? :one : :other }}}
     I18n.backend.store_translations :pt, apples: {one: 'one or none', other: 'more than one'}
     assert_equal 'one or none', ll(:pt, :apples, count: 0)
     assert_equal 'more than one', ll(:pt, :apples, count: 2)
   ensure
-    I18n.reload!
+    I18n.backend.instance_variable_set(:@pluralizers, pluralizers)
   end
 end