summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-30 00:18:18 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-30 00:18:18 +0000
commit7fe9a24a0d649bada6d58ceb7ed9368daf2dce43 (patch)
tree7a1ebf1f98675c10f392827f4a48550ae29a2de9 /test
parent813f3585690a4dcdb87f3e4e031ef4b284762dbb (diff)
Fix wrong expectaion of r33363.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_array.rb3
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