diff options
| author | José Valim <jose.valim@gmail.com> | 2012-01-21 12:03:32 -0800 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-01-21 12:03:32 -0800 |
| commit | a720e347e22101a7ed6cb9892dff8ba275ea3ab0 (patch) | |
| tree | 6195e6de13465c130587f2e944f7ebd4cee2640e | |
| parent | c70135807ed786e6c9e18a35cc83ac6007450ca2 (diff) | |
| parent | caf78564c295e2a8c0326b8eb864f35d4f873f26 (diff) | |
| download | rails-a720e347e22101a7ed6cb9892dff8ba275ea3ab0.tar.gz rails-a720e347e22101a7ed6cb9892dff8ba275ea3ab0.tar.bz2 rails-a720e347e22101a7ed6cb9892dff8ba275ea3ab0.zip | |
Merge pull request #4582 from kennyj/fix_4580
Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
| -rw-r--r-- | activesupport/lib/active_support/tagged_logging.rb | 2 | ||||
| -rw-r--r-- | activesupport/test/tagged_logging_test.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb index 2fad91495d..d71215b447 100644 --- a/activesupport/lib/active_support/tagged_logging.rb +++ b/activesupport/lib/active_support/tagged_logging.rb @@ -27,7 +27,7 @@ module ActiveSupport new_tags.size.times { tags.pop } end - def silence(temporary_level = ERROR, &block) + def silence(temporary_level = Logger::ERROR, &block) @logger.silence(temporary_level, &block) end deprecate :silence diff --git a/activesupport/test/tagged_logging_test.rb b/activesupport/test/tagged_logging_test.rb index 17c4214dfc..dbf8a71e9a 100644 --- a/activesupport/test/tagged_logging_test.rb +++ b/activesupport/test/tagged_logging_test.rb @@ -64,4 +64,8 @@ class TaggedLoggingTest < ActiveSupport::TestCase assert_equal "[BCX] [Jason] Funky time\n[BCX] Junky time!\n", @output.string end + + test "silence" do + assert_nothing_raised { @logger.silence {} } + end end |