diff options
author | Ganesh Kumar <ganesh.dc@gmail.com> | 2011-05-21 13:56:24 +0530 |
---|---|---|
committer | Ganesh Kumar <ganesh.dc@gmail.com> | 2011-05-21 13:56:24 +0530 |
commit | 0a15928f0658c91b197ef15c16580b9abac39ced (patch) | |
tree | e6d35ec893406f6267d37ea124edb59d0f594106 | |
parent | 3d789ea4b9aed42680de3b3bb359a19cd4a48f57 (diff) | |
parent | 7288682be4f9384ad4083415342d8af876f77db8 (diff) | |
download | rails-0a15928f0658c91b197ef15c16580b9abac39ced.tar.gz rails-0a15928f0658c91b197ef15c16580b9abac39ced.tar.bz2 rails-0a15928f0658c91b197ef15c16580b9abac39ced.zip |
Merge remote branch 'upstream/master' into documentation_change
-rw-r--r-- | activesupport/test/deprecation_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb index cad0810241..d77a62f108 100644 --- a/activesupport/test/deprecation_test.rb +++ b/activesupport/test/deprecation_test.rb @@ -62,7 +62,7 @@ class DeprecationTest < ActiveSupport::TestCase end def test_deprecate_class_method - assert_deprecated(/none is deprecated.*test_deprecate_class_method/) do + assert_deprecated(/none is deprecated/) do assert_equal 1, @dtc.none end |