diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-24 10:34:54 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-12-24 10:34:54 -0700 |
commit | b590fe4892d312cbdde350e7c4f8fbbcaf8c61ee (patch) | |
tree | 358869926aadda7bd07fd9ff8349bb8003f1c499 /activesupport/test/clean_logger_test.rb | |
parent | 0e8cbbe7d52deaf0e27121e281ebd60118d89bad (diff) | |
download | rails-b590fe4892d312cbdde350e7c4f8fbbcaf8c61ee.tar.gz rails-b590fe4892d312cbdde350e7c4f8fbbcaf8c61ee.tar.bz2 rails-b590fe4892d312cbdde350e7c4f8fbbcaf8c61ee.zip |
delegating and deprecating logger#silence. fixes #4159
Diffstat (limited to 'activesupport/test/clean_logger_test.rb')
-rw-r--r-- | activesupport/test/clean_logger_test.rb | 41 |
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 |