diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-22 22:26:55 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-22 22:26:55 +0000 |
commit | 9759173cfc954f89a24dd96a42067161a34bd243 (patch) | |
tree | 2886db0d42f3feef29ed65dbcbb073a17e86d274 /test/ruby/test_time.rb | |
parent | 6d6b33e6e5dde12f258ad85bba6475af0aab75cf (diff) | |
download | ruby-9759173cfc954f89a24dd96a42067161a34bd243.tar.gz |
* time.c: zone encoding should be US-ASCII if all 7-bits. Fix r46907.
* test/ruby/test_time.rb, test/ruby/test_time_tz.rb: Update tests.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_time.rb')
-rw-r--r-- | test/ruby/test_time.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb index d0ded0ddf2..f4fb5bf3b3 100644 --- a/test/ruby/test_time.rb +++ b/test/ruby/test_time.rb @@ -527,9 +527,12 @@ class TestTime < Test::Unit::TestCase def assert_zone_encoding(time) zone = time.zone assert_predicate(zone, :valid_encoding?) - return if zone.ascii_only? - enc = Encoding.default_internal || Encoding.find('locale') - assert_equal(enc, zone.encoding) + if zone.ascii_only? + assert_equal(Encoding::US_ASCII, zone.encoding) + else + enc = Encoding.default_internal || Encoding.find('locale') + assert_equal(enc, zone.encoding) + end end def test_zone |