aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2005-10-23 20:00:05 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2005-10-23 20:00:05 +0000
commitb57c86ae7483246fae3a38283f8a132e1ee6b7bd (patch)
tree88a6c95a2ffcba3b7a6f05caf46392fdf89935ed /activesupport/test
parenta2f0ae76d140236e89e73ac87f79934a65d688ed (diff)
downloadrails-b57c86ae7483246fae3a38283f8a132e1ee6b7bd.tar.gz
rails-b57c86ae7483246fae3a38283f8a132e1ee6b7bd.tar.bz2
rails-b57c86ae7483246fae3a38283f8a132e1ee6b7bd.zip
r3689@sedna: jeremy | 2005-10-16 10:24:36 -0700
Ticket 2404 - delete fixtures after using them r3744@sedna: jeremy | 2005-10-23 12:28:28 -0700 track dirty and loaded fixtures more carefully r3745@sedna: jeremy | 2005-10-23 12:29:39 -0700 fix broken tests r3756@sedna: jeremy | 2005-10-23 15:51:00 -0700 Global Logger.silencer switch for Logger#silence. r3757@sedna: jeremy | 2005-10-23 15:51:35 -0700 Correct changelogs git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2715 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/clean_logger_test.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/activesupport/test/clean_logger_test.rb b/activesupport/test/clean_logger_test.rb
index c5ddc713c2..2ff3fd6832 100644
--- a/activesupport/test/clean_logger_test.rb
+++ b/activesupport/test/clean_logger_test.rb
@@ -32,7 +32,14 @@ class CleanLoggerTest < Test::Unit::TestCase
logger.fatal 'fatal'
end
- assert_equal "error\nfatal\nerror\nfatal\n", @out.string
+ # Silencer off.
+ Logger.silencer = false
+ @logger.silence do |logger|
+ logger.warn 'unsilenced'
+ end
+ Logger.silencer = true
+
+ assert_equal "error\nfatal\nerror\nfatal\nunsilenced\n", @out.string
end
end