aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/test
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-10-10 02:14:18 -0300
committerGitHub <noreply@github.com>2016-10-10 02:14:18 -0300
commita50cd3eb59a1696a2e525d03eea3c84aea95bdfc (patch)
tree6a9204773119cf080b0d1678b742b3fbe4d5ebf7 /actionview/test
parent0cbb0be329e1375e415ad37c9c20ea9f74ff1ac3 (diff)
parent12d06dd91dd189df73186b0f537301dbac8af2e2 (diff)
downloadrails-a50cd3eb59a1696a2e525d03eea3c84aea95bdfc.tar.gz
rails-a50cd3eb59a1696a2e525d03eea3c84aea95bdfc.tar.bz2
rails-a50cd3eb59a1696a2e525d03eea3c84aea95bdfc.zip
Merge pull request #26578 from jeremy/undeprecate-plural-positional-arg
Undeprecate plural positional argument
Diffstat (limited to 'actionview/test')
-rw-r--r--actionview/test/template/text_helper_test.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/actionview/test/template/text_helper_test.rb b/actionview/test/template/text_helper_test.rb
index d77e4c6913..fb557c24ac 100644
--- a/actionview/test/template/text_helper_test.rb
+++ b/actionview/test/template/text_helper_test.rb
@@ -379,6 +379,8 @@ class TextHelperTest < ActionView::TestCase
assert_equal("1.25 counts", pluralize("1.25", "count"))
assert_equal("1.0 count", pluralize("1.0", "count"))
assert_equal("1.00 count", pluralize("1.00", "count"))
+ assert_equal("2 counters", pluralize(2, "count", "counters"))
+ assert_equal("0 counters", pluralize(nil, "count", "counters"))
assert_equal("2 counters", pluralize(2, "count", plural: "counters"))
assert_equal("0 counters", pluralize(nil, "count", plural: "counters"))
assert_equal("2 people", pluralize(2, "person"))
@@ -405,12 +407,6 @@ class TextHelperTest < ActionView::TestCase
end
end
- def test_deprecated_plural_as_positional_argument
- assert_deprecated do
- pluralize(2, "count", "counters")
- end
- end
-
def test_cycle_class
value = Cycle.new("one", 2, "3")
assert_equal("one", value.to_s)