1 files changed, 24 insertions, 8 deletions
diff --git a/activesupport/test/broadcast_logger_test.rb b/activesupport/test/broadcast_logger_test.rb
index f95b3e5ad3..184d0ebddd 100644
--- a/activesupport/test/broadcast_logger_test.rb
+++ b/activesupport/test/broadcast_logger_test.rb
@@ -1,4 +1,4 @@
-require 'abstract_unit'
+require "abstract_unit"
 
 module ActiveSupport
   class BroadcastLoggerTest < TestCase
@@ -26,8 +26,8 @@ module ActiveSupport
     test "#close broadcasts to all loggers" do
       logger.close
 
-      assert log1.closed, 'should be closed'
-      assert log2.closed, 'should be closed'
+      assert log1.closed, "should be closed"
+      assert log2.closed, "should be closed"
     end
 
     test "#<< shovels the value into all loggers" do
@@ -69,6 +69,20 @@ module ActiveSupport
       assert_equal ::Logger::FATAL, log2.local_level
     end
 
+    test "#silence does not break custom loggers" do
+      new_logger = FakeLogger.new
+      custom_logger = CustomLogger.new
+      custom_logger.extend(Logger.broadcast(new_logger))
+
+      custom_logger.silence do
+        custom_logger.error "from error"
+        custom_logger.unknown "from unknown"
+      end
+
+      assert_equal [[::Logger::ERROR, "from error", nil], [::Logger::UNKNOWN, "from unknown", nil]], custom_logger.adds
+      assert_equal [[::Logger::ERROR, "from error", nil], [::Logger::UNKNOWN, "from unknown", nil]], new_logger.adds
+    end
+
     test "#silence silences all loggers below the default level of ERROR" do
       logger.silence do
         logger.debug "test"
@@ -98,9 +112,7 @@ module ActiveSupport
       assert_equal [[::Logger::FATAL, "seen", nil]], log2.adds
     end
 
-    class FakeLogger
-      include LoggerSilence
-
+    class CustomLogger
       attr_reader :adds, :closed, :chevrons
       attr_accessor :level, :progname, :formatter, :local_level
 
@@ -138,11 +150,11 @@ module ActiveSupport
         add(::Logger::UNKNOWN, message, &block)
       end
 
-      def << x
+      def <<(x)
         @chevrons << x
       end
 
-      def add(message_level, message=nil, progname=nil, &block)
+      def add(message_level, message = nil, progname = nil, &block)
         @adds << [message_level, message, progname] if message_level >= local_level
       end
 
@@ -150,5 +162,9 @@ module ActiveSupport
         @closed = true
       end
     end
+
+    class FakeLogger < CustomLogger
+      include LoggerSilence
+    end
   end
 end