Permalink
Browse files

assert_deprecated matches any warning caught in block

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5114 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
jeremy committed Sep 15, 2006
1 parent 643571c commit 069b0eaf0bd42a2474028022b1e907dc97cc2e41
Showing with 12 additions and 3 deletions.
  1. +3 −3 activesupport/lib/active_support/deprecation.rb
  2. +9 −0 activesupport/test/deprecation_test.rb
@@ -86,11 +86,11 @@ def #{target}_with_deprecation#{punctuation}(*args, &block)
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
@@ -78,6 +78,15 @@ def test_assert_deprecation_without_match
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 }

0 comments on commit 069b0ea

Please sign in to comment.