mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fix to_datetime test broken by DST change. Closes #7797.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6389 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
bedb879913
commit
93db1989fe
1 changed files with 2 additions and 2 deletions
|
@ -356,10 +356,10 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
|
|||
def test_to_datetime
|
||||
assert_equal Time.utc(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, 0, 0)
|
||||
with_timezone 'US/Eastern' do
|
||||
assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, DateTime.now.offset, 0)
|
||||
assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, Rational(Time.local(2005, 2, 21, 17, 44, 30).utc_offset, 86400), 0)
|
||||
end
|
||||
with_timezone 'NZ' do
|
||||
assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, DateTime.now.offset, 0)
|
||||
assert_equal Time.local(2005, 2, 21, 17, 44, 30).to_datetime, DateTime.civil(2005, 2, 21, 17, 44, 30, Rational(Time.local(2005, 2, 21, 17, 44, 30).utc_offset, 86400), 0)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in a new issue