Changeset 5728

Timestamp:

12/17/06 08:21:45 (2 years ago)

Author:

bitsweat

Message:

Deprecation: silence warnings when reporting test errors.

Files:

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

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Deprecation: silence warnings when reporting test errors.  [Jeremy Kemper]
-
-* Hash#slice(*keys) returns a new hash with only the given keys. #slice! replaces the hash with only the given keys. Works with HashWithIndifferentAccess also.  [Jeremy Kemper]

trunk/activesupport/lib/active_support/deprecation.rb

@@ -173 +173 @@
-end
-
+require 'test/unit'
+
-module Test
-  module Unit
@@ -178 +180 @@
-      include ActiveSupport::Deprecation::Assertions
-    end
+
+    class Error # :nodoc:
+      # Silence warnings when reporting test errors.
+      def message_with_silenced_deprecation
+        ActiveSupport::Deprecation.silence do
+          message_without_silenced_deprecation
+        end
+      end
+
+      alias_method_chain :message, :silenced_deprecation
+    end
-  end
-end

trunk/activesupport/test/deprecation_test.rb

@@ -129 +129 @@
-    assert_deprecated(/you now need to do something extra for this one/) { @dtc.d }
-  end
+
+  def test_assertion_failed_error_doesnt_spout_deprecation_warnings
+    error_class = Class.new(StandardError) do
+      def message
+        ActiveSupport::Deprecation.warn 'warning in error message'
+        super
+      end
+    end
+
+    raise error_class.new('hmm')
+
+  rescue => e
+    error = Test::Unit::Error.new('testing ur doodz', e)
+    assert_not_deprecated { error.message }
+    assert_nil @last_message
+  end
-end