diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-01 15:41:50 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-01 15:41:50 +0000 |
commit | 4d7b0b9112f2adf9e87ef75056f930bf7c1f3dc4 (patch) | |
tree | 8d712e18a619a9720d181d0d44e8cc2474ff31ee /spec/ruby/library/datetime | |
parent | 821d9a2d30f2e0d3f9009dc001b4b49aaa63c66e (diff) |
Update to ruby/spec@bacedc5
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60973 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/ruby/library/datetime')
-rw-r--r-- | spec/ruby/library/datetime/now_spec.rb | 2 | ||||
-rw-r--r-- | spec/ruby/library/datetime/to_time_spec.rb | 12 |
2 files changed, 13 insertions, 1 deletions
diff --git a/spec/ruby/library/datetime/now_spec.rb b/spec/ruby/library/datetime/now_spec.rb index a5bf590aff..9118163533 100644 --- a/spec/ruby/library/datetime/now_spec.rb +++ b/spec/ruby/library/datetime/now_spec.rb @@ -7,7 +7,7 @@ describe "DateTime.now" do end it "sets the current date" do - (DateTime.now - Date.today).to_f.should be_close(0.0, 1.0) + (DateTime.now - Date.today).to_f.should be_close(0.0, 2.0) end it "sets the current time" do diff --git a/spec/ruby/library/datetime/to_time_spec.rb b/spec/ruby/library/datetime/to_time_spec.rb index f5b7cb8a23..2a016d1528 100644 --- a/spec/ruby/library/datetime/to_time_spec.rb +++ b/spec/ruby/library/datetime/to_time_spec.rb @@ -6,6 +6,18 @@ describe "DateTime#to_time" do DateTime.now.to_time.should be_kind_of(Time) end + it "returns a Time representing the same instant" do + datetime = DateTime.civil(3, 12, 31, 23, 58, 59) + time = datetime.to_time.utc + + time.year.should == 3 + time.month.should == 12 + time.day.should == 31 + time.hour.should == 23 + time.min.should == 58 + time.sec.should == 59 + end + ruby_version_is "2.4" do it "preserves the same time regardless of local time or zone" do date = DateTime.new(2012, 12, 24, 12, 23, 00, '+03:00') |