diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-10 14:46:41 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-10 14:46:41 +0000 |
commit | 4f0899d4bba4a03c4de45e742f9e37a89b8b32e2 (patch) | |
tree | 191e375fbacc7f4c24d65c4d08732fc6b69e2fdb /spec | |
parent | 0e0d0c47b890ffea4c8bceb28c0573aa50010e27 (diff) |
merge revision(s) 63823,63839: [Backport #14890]
time.c: [DOC] Time#localtime
* time.c: state that Time#localtime does nothing when nothing
changes. [ruby-core:87675] [Bug #14880]
skip test_localtime_zone if force_tz_test is false
For example Solaris
https://rubyci.org/logs/rubyci.s3.amazonaws.com/unstable10x/ruby-trunk/log/20180703T091803Z.fail.html.gz
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@66780 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec')
-rw-r--r-- | spec/ruby/core/time/localtime_spec.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/spec/ruby/core/time/localtime_spec.rb b/spec/ruby/core/time/localtime_spec.rb index 6f682b0b34..2fc8a2d56a 100644 --- a/spec/ruby/core/time/localtime_spec.rb +++ b/spec/ruby/core/time/localtime_spec.rb @@ -90,6 +90,19 @@ describe "Time#localtime" do t.utc_offset.should == -18000 end + + it "does nothing if already in a local time zone" do + time = with_timezone("America/New_York") do + break Time.new(2005, 2, 27, 22, 50, 0) + end + zone = time.zone + + with_timezone("Europe/Amsterdam") do + time.localtime + end + + time.zone.should == zone + end end describe "with an argument that responds to #to_str" do |