Merge pull request #4582 from kennyj/fix_4580

Fix GH #4580. Rails 3.2: uninitialized constant ActiveSupport::TaggedLogging::ERROR
rails · Jan 21, 2012 · a720e34 · a720e34
2 parents c701358 + caf7856
commit a720e34
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
@@ -27,7 +27,7 @@ def tagged(*new_tags)
       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
@@ -64,4 +64,8 @@ def flush(*)
 
     assert_equal "[BCX] [Jason] Funky time\n[BCX] Junky time!\n", @output.string
   end
+
+  test "silence" do
+    assert_nothing_raised { @logger.silence {} }
+  end
 end