mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #15316 from akshay-vishnoi/test-cases
Fix test cases for inflector.rb
This commit is contained in:
commit
42fe948917
1 changed files with 8 additions and 7 deletions
|
@ -498,10 +498,10 @@ class InflectorTest < ActiveSupport::TestCase
|
||||||
end
|
end
|
||||||
|
|
||||||
%w(plurals singulars uncountables humans acronyms).each do |scope|
|
%w(plurals singulars uncountables humans acronyms).each do |scope|
|
||||||
ActiveSupport::Inflector.inflections do |inflect|
|
define_method("test_clear_inflections_with_#{scope}") do
|
||||||
define_method("test_clear_inflections_with_#{scope}") do
|
with_dup do
|
||||||
with_dup do
|
# clear the inflections
|
||||||
# clear the inflections
|
ActiveSupport::Inflector.inflections do |inflect|
|
||||||
inflect.clear(scope)
|
inflect.clear(scope)
|
||||||
assert_equal [], inflect.send(scope)
|
assert_equal [], inflect.send(scope)
|
||||||
end
|
end
|
||||||
|
@ -516,9 +516,10 @@ class InflectorTest < ActiveSupport::TestCase
|
||||||
# there are module functions that access ActiveSupport::Inflector.inflections,
|
# there are module functions that access ActiveSupport::Inflector.inflections,
|
||||||
# so we need to replace the singleton itself.
|
# so we need to replace the singleton itself.
|
||||||
def with_dup
|
def with_dup
|
||||||
original = ActiveSupport::Inflector::Inflections.instance_variable_get(:@__instance__)
|
original = ActiveSupport::Inflector::Inflections.instance_variable_get(:@__instance__)[:en]
|
||||||
ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, original.dup)
|
ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original.dup)
|
||||||
|
yield
|
||||||
ensure
|
ensure
|
||||||
ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, original)
|
ActiveSupport::Inflector::Inflections.instance_variable_set(:@__instance__, en: original)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue