diff options
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/deprecation.rb | 6 | ||||
-rw-r--r-- | activesupport/test/deprecation_test.rb | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/deprecation.rb b/activesupport/lib/active_support/deprecation.rb index 22a50f7e8b..e4e1d187a5 100644 --- a/activesupport/lib/active_support/deprecation.rb +++ b/activesupport/lib/active_support/deprecation.rb @@ -86,11 +86,11 @@ module ActiveSupport module Assertions def assert_deprecated(match = nil, &block) - last = collect_deprecations(&block).last - assert last, "Expected a deprecation warning within the block but received none" + warnings = collect_deprecations(&block) + assert !warnings.empty?, "Expected a deprecation warning within the block but received none" if match match = Regexp.new(Regexp.escape(match)) unless match.is_a?(Regexp) - assert_match match, last, "Deprecation warning didn't match #{match}: #{last}" + assert warnings.any? { |w| w =~ match }, "No deprecation warning matched #{match}: #{warnings.join(', ')}" end end diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb index 12fe5f3bf2..a7d833f49d 100644 --- a/activesupport/test/deprecation_test.rb +++ b/activesupport/test/deprecation_test.rb @@ -78,6 +78,15 @@ class DeprecationTest < Test::Unit::TestCase end end + def test_assert_deprecated_matches_any_warning + assert_deprecated 'abc' do + ActiveSupport::Deprecation.warn 'abc' + ActiveSupport::Deprecation.warn 'def' + end + rescue Test::Unit::AssertionFailedError + flunk 'assert_deprecated should match any warning in block, not just the last one' + end + def test_silence ActiveSupport::Deprecation.silence do assert_not_deprecated { @dtc.partially } |