2 files changed, 28 insertions, 34 deletions

diff --git a/activesupport/test/broadcast_logger_test.rb b/activesupport/test/broadcast_logger_test.rb
index e7d56c80c3..6d4e3b74f7 100644
--- a/activesupport/test/broadcast_logger_test.rb
+++ b/activesupport/test/broadcast_logger_test.rb
@@ -2,69 +2,56 @@ require 'abstract_unit'
 
 module ActiveSupport
   class BroadcastLoggerTest < TestCase
-    attr_reader :logger, :receiving_logger
+    attr_reader :logger, :log1, :log2
     def setup
-      @logger = FakeLogger.new
-      @receiving_logger = FakeLogger.new
-      @logger.extend Logger.broadcast @receiving_logger
+      @log1 = FakeLogger.new
+      @log2 = FakeLogger.new
+      @log1.extend Logger.broadcast @log2
+      @logger = @log1
     end
 
     def test_debug
       logger.debug "foo"
-      assert_equal 'foo', logger.adds.first[2]
-      assert_equal 'foo', receiving_logger.adds.first[2]
-    end
-
-    def test_debug_without_message_broadcasts
-      logger.broadcast_messages = false
-      logger.debug "foo"
-      assert_equal 'foo', logger.adds.first[2]
-      assert_equal [], receiving_logger.adds
+      assert_equal 'foo', log1.adds.first[2]
+      assert_equal 'foo', log2.adds.first[2]
     end
 
     def test_close
       logger.close
-      assert logger.closed, 'should be closed'
-      assert receiving_logger.closed, 'should be closed'
+      assert log1.closed, 'should be closed'
+      assert log2.closed, 'should be closed'
     end
 
     def test_chevrons
       logger << "foo"
-      assert_equal %w{ foo }, logger.chevrons
-      assert_equal %w{ foo }, receiving_logger.chevrons
-    end
-
-    def test_chevrons_without_message_broadcasts
-      logger.broadcast_messages = false
-      logger << "foo"
-      assert_equal %w{ foo }, logger.chevrons
-      assert_equal [], receiving_logger.chevrons
+      assert_equal %w{ foo }, log1.chevrons
+      assert_equal %w{ foo }, log2.chevrons
     end
 
     def test_level
       assert_nil logger.level
       logger.level = 10
-      assert_equal 10, logger.level
-      assert_equal 10, receiving_logger.level
+      assert_equal 10, log1.level
+      assert_equal 10, log2.level
     end
 
     def test_progname
       assert_nil logger.progname
       logger.progname = 10
-      assert_equal 10, logger.progname
-      assert_equal 10, receiving_logger.progname
+      assert_equal 10, log1.progname
+      assert_equal 10, log2.progname
     end
 
     def test_formatter
       assert_nil logger.formatter
       logger.formatter = 10
-      assert_equal 10, logger.formatter
-      assert_equal 10, receiving_logger.formatter
+      assert_equal 10, log1.formatter
+      assert_equal 10, log2.formatter
     end
 
     class FakeLogger
       attr_reader :adds, :closed, :chevrons
-      attr_accessor :level, :progname, :formatter, :broadcast_messages
+      attr_accessor :level, :progname, :formatter
 
       def initialize
         @adds      = []
@@ -73,7 +60,6 @@ module ActiveSupport
         @level     = nil
         @progname  = nil
         @formatter = nil
-        @broadcast_messages = true
       end
 
       def debug msg, &block
diff --git a/activesupport/test/logger_test.rb b/activesupport/test/logger_test.rb
index a57dc7a241..317e09b7f2 100644
--- a/activesupport/test/logger_test.rb
+++ b/activesupport/test/logger_test.rb
@@ -17,6 +17,14 @@ class LoggerTest < ActiveSupport::TestCase
     @logger  = Logger.new(@output)
   end
 
+  def test_log_outputs_to
+    assert Logger.logger_outputs_to?(@logger, @output),            "Expected logger_outputs_to? @output to return true but was false"
+    assert Logger.logger_outputs_to?(@logger, @output, STDOUT),    "Expected logger_outputs_to? @output or STDOUT to return true but was false"
+
+    assert_not Logger.logger_outputs_to?(@logger, STDOUT),         "Expected logger_outputs_to? to STDOUT to return false, but was true"
+    assert_not Logger.logger_outputs_to?(@logger, STDOUT, STDERR), "Expected logger_outputs_to? to STDOUT or STDERR to return false, but was true"
+  end
+
   def test_write_binary_data_to_existing_file
     t = Tempfile.new ['development', 'log']
     t.binmode
@@ -65,7 +73,7 @@ class LoggerTest < ActiveSupport::TestCase
   def test_should_not_log_debug_messages_when_log_level_is_info
     @logger.level = Logger::INFO
     @logger.add(Logger::DEBUG, @message)
-    assert ! @output.string.include?(@message)
+    assert_not @output.string.include?(@message)
   end
 
   def test_should_add_message_passed_as_block_when_using_add
@@ -129,7 +137,7 @@ class LoggerTest < ActiveSupport::TestCase
       @logger.error "THIS IS HERE"
     end
 
-    assert !@output.string.include?("NOT THERE")
+    assert_not @output.string.include?("NOT THERE")
     assert @output.string.include?("THIS IS HERE")
   end