aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/inflector_test_cases.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-12-08 00:04:45 -0800
committerJosé Valim <jose.valim@gmail.com>2011-12-08 00:04:45 -0800
commit0144f4f023348e64e0816e41b4f9dd2ad819e443 (patch)
tree79907e570243ca58cd281ecf11667bd50ee9edd9 /activesupport/test/inflector_test_cases.rb
parenta505b1377422a1821798d060301c50abea6afbd4 (diff)
parent6f253fb440d4979632ab7763e8cf353f9519cc35 (diff)
downloadrails-0144f4f023348e64e0816e41b4f9dd2ad819e443.tar.gz
rails-0144f4f023348e64e0816e41b4f9dd2ad819e443.tar.bz2
rails-0144f4f023348e64e0816e41b4f9dd2ad819e443.zip
Merge pull request #3901 from mark-rushakoff/inflection-regex-fix
Fix inflection regexes for mouse, mice
Diffstat (limited to 'activesupport/test/inflector_test_cases.rb')
-rw-r--r--activesupport/test/inflector_test_cases.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb
index e3a343af52..eb2915c286 100644
--- a/activesupport/test/inflector_test_cases.rb
+++ b/activesupport/test/inflector_test_cases.rb
@@ -104,7 +104,11 @@ module InflectorTestCases
"edge" => "edges",
"cow" => "kine",
- "database" => "databases"
+ "database" => "databases",
+
+ # regression tests against improper inflection regexes
+ "|ice" => "|ices",
+ "|ouse" => "|ouses"
}
CamelToUnderscore = {