aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2012-04-30 00:13:40 -0700
committerJosé Valim <jose.valim@gmail.com>2012-04-30 00:13:40 -0700
commit66c5ac3be9c362cd7cadb57cc60cfc48eade39db (patch)
tree67870229e2cf77faf6c9f5fa3f938a40d8b9e1fc /activesupport/test
parent976b1709bab2150d28cdf65093cda8f2e40865fb (diff)
parent16e7f2f809c586d2d9a27c2b57395350b596e0b7 (diff)
downloadrails-66c5ac3be9c362cd7cadb57cc60cfc48eade39db.tar.gz
rails-66c5ac3be9c362cd7cadb57cc60cfc48eade39db.tar.bz2
rails-66c5ac3be9c362cd7cadb57cc60cfc48eade39db.zip
Merge pull request #5177 from cap10morgan/fix-gh-issue-4374
fix inflector bug where -ice gets singularized into -ouse
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/inflector_test_cases.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb
index 86c5e1f135..4d10cfca25 100644
--- a/activesupport/test/inflector_test_cases.rb
+++ b/activesupport/test/inflector_test_cases.rb
@@ -109,7 +109,9 @@ module InflectorTestCases
# regression tests against improper inflection regexes
"|ice" => "|ices",
- "|ouse" => "|ouses"
+ "|ouse" => "|ouses",
+ "slice" => "slices",
+ "police" => "police"
}
CamelToUnderscore = {