Navigation

Changeset 4719

Timestamp:

08/08/06 06:57:59 (2 years ago)

Author:

bitsweat

Message:

Include called method in instance variable deprecation warning.

Files:

r4698	r4719
52	52	last = with_last_message_tracking_deprecation_behavior(&block)
53	53	assert last, "Expected a deprecation warning within the block but received none"
54		match = Regexp.new(~~match~~) unless match.is_a?(Regexp)
	54	match = Regexp.new(Regexp.escape(match)) unless match.is_a?(Regexp)
55	55	assert_match match, last, "Deprecation warning didn't match #{match}: #{last}"
56	56	end
…	…
82	82
83	83	private
84		~~def deprecation_warning(called, callstack)~~
85		~~ActiveSupport::Deprecation.warn("Using #{@var} directly is deprecated - call #{@method} instead.", callstack)~~
86		~~end~~
87
88	84	def method_missing(called, *args, &block)
89		~~deprecation_warning called, caller~~
	85	ActiveSupport::Deprecation.warn("#{@var} is deprecated! Call #{@method}.#{called} instead of #{@var}.#{called}. Args: #{args.inspect}", caller)
90	86	@instance.__send__(@method).__send__(called, *args, &block)
91	87	end

r4698	r4719
69	69	assert_not_deprecated { @dtc.request.size }
70	70
71		warning = 'Using @request directly is deprecated - call request instead.'
72		assert_deprecated(warning) { assert_equal @dtc.request.size, @dtc.old_request.size }
73		assert_deprecated(warning) { assert_equal @dtc.request.to_s, @dtc.old_request.to_s }
	71	assert_deprecated('@request.size') { assert_equal @dtc.request.size, @dtc.old_request.size }
	72	assert_deprecated('@request.to_s') { assert_equal @dtc.request.to_s, @dtc.old_request.to_s }
74	73	end
75	74	end