diff options
| author | Matthew Draper <matthew@trebex.net> | 2014-09-06 04:56:25 +0930 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2014-09-06 04:56:25 +0930 |
| commit | ccbb48196efe06a0c1c360951caff74ee74a8d14 (patch) | |
| tree | f1f719f0ada69e57ef441c8f398ad3c44751d067 /activesupport/test | |
| parent | 9576605dfdb4b65210e26036d04a6984f1fcf3a8 (diff) | |
| download | rails-ccbb48196efe06a0c1c360951caff74ee74a8d14.tar.gz rails-ccbb48196efe06a0c1c360951caff74ee74a8d14.tar.bz2 rails-ccbb48196efe06a0c1c360951caff74ee74a8d14.zip | |
Fix for inflector's incorrect camelCase replacement for acronyms
Fixes #8015, #9756.
[Fred Wu & Matthew Draper]
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/inflector_test.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/inflector_test_cases.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb index 58fdea0972..b37f31bc5f 100644 --- a/activesupport/test/inflector_test.rb +++ b/activesupport/test/inflector_test.rb @@ -120,6 +120,7 @@ class InflectorTest < ActiveSupport::TestCase ["SSLError", "ssl_error", "SSL error", "SSL Error"], ["RESTful", "restful", "RESTful", "RESTful"], ["RESTfulController", "restful_controller", "RESTful controller", "RESTful Controller"], + ["Nested::RESTful", "nested/restful", "Nested/RESTful", "Nested/RESTful"], ["IHeartW3C", "i_heart_w3c", "I heart W3C", "I Heart W3C"], ["PhDRequired", "phd_required", "PhD required", "PhD Required"], ["IRoRU", "i_ror_u", "I RoR u", "I RoR U"], diff --git a/activesupport/test/inflector_test_cases.rb b/activesupport/test/inflector_test_cases.rb index b556da0046..3770f00fe3 100644 --- a/activesupport/test/inflector_test_cases.rb +++ b/activesupport/test/inflector_test_cases.rb @@ -141,6 +141,7 @@ module InflectorTestCases "HTMLTidyGenerator" => "html_tidy_generator", "FreeBSD" => "free_bsd", "HTML" => "html", + "ForceXMLController" => "force_xml_controller", } CamelWithModuleToUnderscoreWithSlash = { |