From 27cec63246ee836a272b8309b39a65a1bd7d11b2 Mon Sep 17 00:00:00 2001 From: kosaki Date: Sat, 8 Oct 2011 11:34:39 +0000 Subject: merge revision(s) 33364: ------------------------------------------------------------------------ r33364 | naruse | 2011-09-29 20:18:18 -0400 (Thu, 29 Sep 2011) | 1 line Fix wrong expectaion of r33363. ------------------------------------------------------------------------ git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33437 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_array.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test/ruby/test_array.rb') diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 8d25e85d62..8f1d53d933 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -927,7 +927,8 @@ class TestArray < Test::Unit::TestCase 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 -- cgit v1.2.3