delegating and deprecating logger#silence. fixes #4159

1 files changed, 25 insertions, 16 deletions

diff --git a/activesupport/test/clean_logger_test.rb b/activesupport/test/clean_logger_test.rb
index 2cc46904b4..970e97d492 100644
--- a/activesupport/test/clean_logger_test.rb
+++ b/activesupport/test/clean_logger_test.rb
@@ -1,8 +1,11 @@
 require 'abstract_unit'
 require 'stringio'
 require 'active_support/core_ext/logger'
+require 'active_support/testing/deprecation'
 
 class CleanLoggerTest < Test::Unit::TestCase
+  include ActiveSupport::Testing::Deprecation
+
   def setup
     @out = StringIO.new
     @logger = Logger.new(@out)
@@ -14,28 +17,34 @@ class CleanLoggerTest < Test::Unit::TestCase
   end
 
   def test_silence
-    # Without yielding self.
-    @logger.silence do
-      @logger.debug  'debug'
-      @logger.info   'info'
-      @logger.warn   'warn'
-      @logger.error  'error'
-      @logger.fatal  'fatal'
+    assert_deprecated do
+      # Without yielding self.
+      @logger.silence do
+        @logger.debug  'debug'
+        @logger.info   'info'
+        @logger.warn   'warn'
+        @logger.error  'error'
+        @logger.fatal  'fatal'
+      end
     end
 
-    # Yielding self.
-    @logger.silence do |logger|
-      logger.debug  'debug'
-      logger.info   'info'
-      logger.warn   'warn'
-      logger.error  'error'
-      logger.fatal  'fatal'
+    assert_deprecated do
+      # Yielding self.
+      @logger.silence do |logger|
+        logger.debug  'debug'
+        logger.info   'info'
+        logger.warn   'warn'
+        logger.error  'error'
+        logger.fatal  'fatal'
+      end
     end
 
     # Silencer off.
     Logger.silencer = false
-    @logger.silence do |logger|
-      logger.warn   'unsilenced'
+    assert_deprecated do
+      @logger.silence do |logger|
+        logger.warn   'unsilenced'
+      end
     end
     Logger.silencer = true