kosaki	2011-10-08 20:34:39 +0900 (Sat, 08 Oct 2011)

  New Revision: 33437

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33437

  Log:
    merge revision(s) 33364:
    ------------------------------------------------------------------------
    r33364 | naruse | 2011-09-29 20:18:18 -0400 (Thu, 29 Sep 2011) | 1 line
    
    Fix wrong expectaion of r33363.
    ------------------------------------------------------------------------

  Modified files:
    branches/ruby_1_9_3/test/ruby/test_array.rb

Index: ruby_1_9_3/test/ruby/test_array.rb
===================================================================
--- ruby_1_9_3/test/ruby/test_array.rb	(revision 33436)
+++ ruby_1_9_3/test/ruby/test_array.rb	(revision 33437)
@@ -927,7 +927,8 @@
     assert_equal(Encoding::UTF_8, [u, [e]].join.encoding)
     assert_equal(Encoding::UTF_8, [u, [1]].join.encoding)
     bug5379 = '[ruby-core:39776]'
-    assert_equal(Encoding::UTF_8, [[], u, nil].join.encoding, bug5379)
+    assert_equal(Encoding::US_ASCII, [[], u, nil].join.encoding, bug5379)
+    assert_equal(Encoding::UTF_8, [[], "\u3042", nil].join.encoding, bug5379)
   ensure
     $, = nil
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/