Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

DeprecatedInstanceVariable#inspect doesn't warn since test/unit, erro…

…r logs, and others use it for diagnostics.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5763 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 01452feff1ab4e06ed41cd093bb8a140cd6b2cb6 1 parent a8b53f1
@jeremy jeremy authored
View
9 activesupport/lib/active_support/deprecation.rb
@@ -143,7 +143,8 @@ def collect_deprecations
end
end
- # Stand-in for @request, @attributes, etc.
+ # Stand-in for @request, @attributes, @params, etc which emits deprecation
+ # warnings on any method call (except #inspect).
class DeprecatedInstanceVariableProxy
instance_methods.each { |m| undef_method m unless m =~ /^__/ }
@@ -151,6 +152,12 @@ def initialize(instance, method, var = "@#{method}")
@instance, @method, @var = instance, method, var
end
+ # Don't give a deprecation warning on inspect since test/unit and error
+ # logs rely on it for diagnostics.
+ def inspect
+ target.inspect
+ end
+
private
def method_missing(called, *args, &block)
warn caller, called, args
View
4 activesupport/test/deprecation_test.rb
@@ -79,6 +79,10 @@ def test_deprecated_instance_variable_proxy
assert_deprecated('@request.to_s') { assert_equal @dtc.request.to_s, @dtc.old_request.to_s }
end
+ def test_deprecated_instance_variable_proxy_shouldnt_warn_on_inspect
+ assert_not_deprecated { assert_equal @dtc.request.inspect, @dtc.old_request.inspect }
+ end
+
def test_assert_deprecation_without_match
assert_deprecated do
@dtc.partially
Please sign in to comment.
Something went wrong with that request. Please try again.