Navigation

Changeset 5115

Timestamp:

09/15/06 05:54:18 (2 years ago)

Author:

bitsweat

Message:

assert_deprecated returns result of block

Files:

r5114	r5115
87	87	module Assertions
88	88	def assert_deprecated(match = nil, &block)
89		warnings = collect_deprecations(&block)
	89	result, warnings = collect_deprecations(&block)
90	90	assert !warnings.empty?, "Expected a deprecation warning within the block but received none"
91	91	if match
…	…
93	93	assert warnings.any? { \|w\| w =~ match }, "No deprecation warning matched #{match}: #{warnings.join(', ')}"
94	94	end
	95	result
95	96	end
96	97
97	98	def assert_not_deprecated(&block)
98		deprecations = collect_deprecations(&block)
	99	result, deprecations = collect_deprecations(&block)
99	100	assert deprecations.empty?, "Expected no deprecation warning within the block but received #{deprecations.size}: \n #{deprecations * "\n "}"
	101	result
100	102	end
101	103
…	…
107	109	deprecations << message
108	110	end
109		yield
110		~~deprecations~~
	111	result = yield
	112	[result, deprecations]
111	113	ensure
112	114	ActiveSupport::Deprecation.behavior = old_behavior

r5114	r5115
88	88	end
89	89
	90	def test_assert_not_deprecated_returns_result_of_block
	91	assert_equal 123, assert_not_deprecated { 123 }
	92	end
	93
	94	def test_assert_deprecated_returns_result_of_block
	95	result = assert_deprecated('abc') do
	96	ActiveSupport::Deprecation.warn 'abc'
	97	123
	98	end
	99	assert_equal 123, result
	100	end
	101
90	102	def test_silence
91	103	ActiveSupport::Deprecation.silence do

r4979	r5115
97	97	def test_include_subclasses_should_warn
98	98	c = Class.new
99		deps = collect_deprecations do
	99	result, deps = collect_deprecations do
100	100	c.send :include, Reloadable::Subclasses
101	101	end
102	102	assert_equal 1, deps.size
103	103	assert_match %r{Reloadable::Subclasses}, deps.first
104
	104
105	105	assert_deprecated_reloadable { c.reloadable? }
106	106	end
…	…
108	108	def test_include_deprecated_should_not_warn
109	109	c = Class.new
110		deps = collect_deprecations do
	110	result, deps = collect_deprecations do
111	111	c.send :include, Reloadable::Deprecated
112	112	end