Changeset 5763

Timestamp:

12/20/06 21:28:31 (2 years ago)

Author:

bitsweat

Message:

DeprecatedInstanceVariable#inspect doesn't warn since test/unit, error logs, and others use it for diagnostics.

Files:

• trunk/activesupport/lib/active_support/deprecation.rb (modified) (2 diffs)
• trunk/activesupport/test/deprecation_test.rb (modified) (1 diff)

trunk/activesupport/lib/active_support/deprecation.rb

@@ -144 +144 @@
-    end
-
-
+
+
-    class DeprecatedInstanceVariableProxy
-      instance_methods.each { |m| undef_method m unless m =~ /^__/ }
@@ -150 +151 @@
-      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
-

trunk/activesupport/test/deprecation_test.rb

@@ -80 +80 @@
-  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