aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-09-15 03:56:25 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-09-15 03:56:25 +0000
commit069b0eaf0bd42a2474028022b1e907dc97cc2e41 (patch)
tree4b7daa6e336713616783d345432fa31b268a8776 /activesupport
parent643571ca25bc2fcc701e6def0975f56fe10a732f (diff)
downloadrails-069b0eaf0bd42a2474028022b1e907dc97cc2e41.tar.gz
rails-069b0eaf0bd42a2474028022b1e907dc97cc2e41.tar.bz2
rails-069b0eaf0bd42a2474028022b1e907dc97cc2e41.zip
assert_deprecated matches any warning caught in block
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5114 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/deprecation.rb6
-rw-r--r--activesupport/test/deprecation_test.rb9
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 }