aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/core_ext/time_with_zone_test.rb
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2013-01-21 12:19:10 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2013-01-21 12:33:49 +0000
commitb79adc4323ff289aed3f5787fdfbb9542aa4f89f (patch)
tree15dcc2a3165ef1170979586795bbc03976428eef /activesupport/test/core_ext/time_with_zone_test.rb
parent68a6fb695346f1b6f84dcba21bb48114cde297a5 (diff)
downloadrails-b79adc4323ff289aed3f5787fdfbb9542aa4f89f.tar.gz
rails-b79adc4323ff289aed3f5787fdfbb9542aa4f89f.tar.bz2
rails-b79adc4323ff289aed3f5787fdfbb9542aa4f89f.zip
Standardise the return value of `to_time`
This commit standardises the return value of `to_time` to an instance of `Time` in the local system timezone, matching the Ruby core and standard library behavior. The default form for `String#to_time` has been changed from :utc to :local but research seems to suggest the latter is the more common form. Also fix an edge condition with `String#to_time` where the string has a timezone offset in it and the mode is :local. e.g: # Before: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 05:00:00 -0500 # After: >> "2000-01-01 00:00:00 -0500".to_time(:local) => 2000-01-01 00:00:00 -0500 Closes #2453
Diffstat (limited to 'activesupport/test/core_ext/time_with_zone_test.rb')
-rw-r--r--activesupport/test/core_ext/time_with_zone_test.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb
index 6c773770f0..18eca4cd8b 100644
--- a/activesupport/test/core_ext/time_with_zone_test.rb
+++ b/activesupport/test/core_ext/time_with_zone_test.rb
@@ -327,7 +327,11 @@ class TimeWithZoneTest < ActiveSupport::TestCase
end
def test_to_time
- assert_equal @twz, @twz.to_time
+ with_env_tz 'US/Eastern' do
+ assert_equal Time, @twz.to_time.class
+ assert_equal Time.local(1999, 12, 31, 19), @twz.to_time
+ assert_equal Time.local(1999, 12, 31, 19).utc_offset, @twz.to_time.utc_offset
+ end
end
def test_to_date