diff options
| -rw-r--r-- | activesupport/lib/active_support/deprecation.rb | 3 | ||||
| -rw-r--r-- | activesupport/test/deprecation_test.rb | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index c61dd73076..2cfbfcc21a 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -87,10 +87,9 @@ module ActiveSupport deprecations = [] ActiveSupport::Deprecation.behavior = Proc.new do |message| deprecations << message - old_behavior.call(message) if old_behavior end yield - return deprecations + deprecations ensure ActiveSupport::Deprecation.behavior = old_behavior end diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb index 75a0d38f5b..cda45c6a9f 100644 --- a/activesupport/test/deprecation_test.rb +++ b/activesupport/test/deprecation_test.rb @@ -39,7 +39,7 @@ class DeprecationTest < Test::Unit::TestCase @dtc.partially end end - + def test_undeprecated assert_not_deprecated do assert_equal 2, @dtc.not @@ -67,21 +67,20 @@ class DeprecationTest < Test::Unit::TestCase def test_deprecated_instance_variable_proxy assert_not_deprecated { @dtc.request.size } - + assert_deprecated('@request.size') { assert_equal @dtc.request.size, @dtc.old_request.size } assert_deprecated('@request.to_s') { assert_equal @dtc.request.to_s, @dtc.old_request.to_s } end - + def test_assert_deprecation_without_match assert_deprecated do @dtc.partially end end - + def test_silence ActiveSupport::Deprecation.silence do assert_not_deprecated { @dtc.partially } end end - end |