summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-18 10:43:48 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-02-18 10:43:48 +0000
commit4fdfac491a95b99ad782991d9eaaa35456f897b5 (patch)
treede77dd53b9f14c7ddc5854bb51ff210bb504e638 /test
parentb0416f342a2b2f43a17189fdbb24e53cef08e4ba (diff)
merges r30721 from trunk into ruby_1_9_2.
-- * array.c (rb_ary_join): [].join.encoding must be US-ASCII. [ruby-list:47790] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/ruby/test_array.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 1816ea1d02..1c80f2d145 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -890,6 +890,7 @@ class TestArray < Test::Unit::TestCase
a = @cls[]
assert_equal("", a.join)
assert_equal("", a.join(','))
+ assert_equal(Encoding::US_ASCII, a.join.encoding)
$, = ""
a = @cls[1, 2]