diff options
| author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-08 11:34:39 +0000 |
|---|---|---|
| committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-08 11:34:39 +0000 |
| commit | 27cec63246ee836a272b8309b39a65a1bd7d11b2 (patch) | |
| tree | c3c24d07577fcfd7f614e1bb6bffae2a844527a6 /test | |
| parent | da8a6a6594a12fdb2484f917e957378663779de0 (diff) | |
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
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_array.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 |