assert_deprecated matches any warning caught in block

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5114 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 9 insertions, 0 deletions

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 }