fix mixed encoding logs can't be logged.

[#4807 state:committed]

Signed-off-by: Kouhei Sutou <kou@cozmixng.org>
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>

1 files changed, 15 insertions, 0 deletions

diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index 850febb959..97c0ef14db 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -1,9 +1,12 @@
 require 'abstract_unit'
+require 'multibyte_test_helpers'
 require 'stringio'
 require 'fileutils'
 require 'active_support/buffered_logger'
 
 class BufferedLoggerTest < Test::Unit::TestCase
+  include MultibyteTestHelpers
+
   Logger = ActiveSupport::BufferedLogger
 
   def setup
@@ -146,4 +149,16 @@ class BufferedLoggerTest < Test::Unit::TestCase
     @logger.expects :clear_buffer
     @logger.flush
   end
+
+  def test_buffer_multibyte
+    @logger.auto_flushing = 2
+    @logger.info(UNICODE_STRING)
+    @logger.info(BYTE_STRING)
+    assert @output.string.include?(UNICODE_STRING)
+    byte_string = @output.string.dup
+    if byte_string.respond_to?(:force_encoding)
+      byte_string.force_encoding("ASCII-8BIT")
+    end
+    assert byte_string.include?(BYTE_STRING)
+  end
 end