Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Include called method in instance variable deprecation warning.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4719 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 0a44c858660600960a2f7be75ce53e9a7841ae76 1 parent 52c9ad4
@jeremy jeremy authored
View
8 activesupport/lib/active_support/deprecation.rb
@@ -51,7 +51,7 @@ module Assertions
def assert_deprecated(match = nil, &block)
last = with_last_message_tracking_deprecation_behavior(&block)
assert last, "Expected a deprecation warning within the block but received none"
- match = Regexp.new(match) unless match.is_a?(Regexp)
+ match = Regexp.new(Regexp.escape(match)) unless match.is_a?(Regexp)
assert_match match, last, "Deprecation warning didn't match #{match}: #{last}"
end
@@ -81,12 +81,8 @@ def initialize(instance, method, var = "@#{method}")
end
private
- def deprecation_warning(called, callstack)
- ActiveSupport::Deprecation.warn("Using #{@var} directly is deprecated - call #{@method} instead.", callstack)
- end
-
def method_missing(called, *args, &block)
- deprecation_warning called, caller
+ ActiveSupport::Deprecation.warn("#{@var} is deprecated! Call #{@method}.#{called} instead of #{@var}.#{called}. Args: #{args.inspect}", caller)
@instance.__send__(@method).__send__(called, *args, &block)
end
end
View
5 activesupport/test/deprecation_test.rb
@@ -68,8 +68,7 @@ def test_nil_behavior_is_ignored
def test_deprecated_instance_variable_proxy
assert_not_deprecated { @dtc.request.size }
- warning = 'Using @request directly is deprecated - call request instead.'
- assert_deprecated(warning) { assert_equal @dtc.request.size, @dtc.old_request.size }
- assert_deprecated(warning) { assert_equal @dtc.request.to_s, @dtc.old_request.to_s }
+ assert_deprecated('@request.size') { assert_equal @dtc.request.size, @dtc.old_request.size }
+ assert_deprecated('@request.to_s') { assert_equal @dtc.request.to_s, @dtc.old_request.to_s }
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.