aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/inflector_test.rb
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2013-03-16 15:24:36 -0700
committerSteve Klabnik <steve@steveklabnik.com>2013-03-16 15:25:49 -0700
commitfeaa6e2048fe86bcf07e967d6e47b865e42e055b (patch)
tree0f50da54bb8efdf57aa6275fd4c25db408716fdc /activesupport/test/inflector_test.rb
parent19797df29e97c22c2e045c832a89e901bdd6ba8c (diff)
downloadrails-feaa6e2048fe86bcf07e967d6e47b865e42e055b.tar.gz
rails-feaa6e2048fe86bcf07e967d6e47b865e42e055b.tar.bz2
rails-feaa6e2048fe86bcf07e967d6e47b865e42e055b.zip
Revert "Merge pull request #8156 from fredwu/acronym_fix-master"
This reverts commit 867dc1700f32aae6f98c4651bd501597e6b52bc0, reversing changes made to 9a421aaa8285cf2a7ecb1af370748b0337818930. This breaks anyone who's using ForceSSL: https://travis-ci.org/rails-api/rails-api/jobs/5556065 Please see comments on #8156 for some discussion.
Diffstat (limited to 'activesupport/test/inflector_test.rb')
-rw-r--r--activesupport/test/inflector_test.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/test/inflector_test.rb b/activesupport/test/inflector_test.rb
index 2b74055e68..4806ce07f6 100644
--- a/activesupport/test/inflector_test.rb
+++ b/activesupport/test/inflector_test.rb
@@ -167,13 +167,11 @@ class InflectorTest < ActiveSupport::TestCase
def test_underscore_acronym_sequence
ActiveSupport::Inflector.inflections do |inflect|
inflect.acronym("API")
- inflect.acronym("APIs")
inflect.acronym("JSON")
inflect.acronym("HTML")
end
assert_equal("json_html_api", ActiveSupport::Inflector.underscore("JSONHTMLAPI"))
- assert_equal("namespaced/apis", ActiveSupport::Inflector.underscore("Namespaced::APIs"))
end
def test_underscore