aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-05-07 16:14:37 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-05-07 16:14:37 -0700
commit70f9558d0e4b8e605576693cbb489caa5cf6a2bc (patch)
treee96fd4b537db67d8b7a33efeb6994cbdc4563665 /activesupport
parent820b6f3da02da447dd113400edffa37927cb4579 (diff)
parent0bc91a4cf7e7fd1ab0786c292d1f1ca6265bfd3f (diff)
downloadrails-70f9558d0e4b8e605576693cbb489caa5cf6a2bc.tar.gz
rails-70f9558d0e4b8e605576693cbb489caa5cf6a2bc.tar.bz2
rails-70f9558d0e4b8e605576693cbb489caa5cf6a2bc.zip
Merge pull request #449 from msgehard/rename_duplicate_test_methods
Rename duplicate tests
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/test/class_cache_test.rb2
-rw-r--r--activesupport/test/xml_mini_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/test/class_cache_test.rb b/activesupport/test/class_cache_test.rb
index 8445af8d25..fc2d54515d 100644
--- a/activesupport/test/class_cache_test.rb
+++ b/activesupport/test/class_cache_test.rb
@@ -58,7 +58,7 @@ module ActiveSupport
assert @cache.key?(ClassCacheTest.name)
end
- def test_new_rejects_strings
+ def test_new_rejects_strings_when_called_on_a_new_string
assert_deprecated do
@cache.new ClassCacheTest.name
end
diff --git a/activesupport/test/xml_mini_test.rb b/activesupport/test/xml_mini_test.rb
index bf6b0b283d..310d86a019 100644
--- a/activesupport/test/xml_mini_test.rb
+++ b/activesupport/test/xml_mini_test.rb
@@ -48,7 +48,7 @@ module XmlMiniTest
assert_equal "__id", ActiveSupport::XmlMini.rename_key("__id")
end
- def test_rename_key_does_not_dasherize_multiple_leading_underscores
+ def test_rename_key_does_not_dasherize_multiple_trailing_underscores
assert_equal "id__", ActiveSupport::XmlMini.rename_key("id__")
end
end