diff options
| author | Ulysse Carion <ulyssecarion@gmail.com> | 2014-05-07 09:12:25 -0700 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2014-05-11 15:04:49 +0100 |
| commit | 0e909cd3078bab352eb741426024334afe0d6820 (patch) | |
| tree | 54e55a746a6f01d6b4b33bd9f9177d37a0aaf95c /activesupport/test | |
| parent | 65b9abf56114b629a3cd3f59f395d20b692bae89 (diff) | |
| download | rails-0e909cd3078bab352eb741426024334afe0d6820.tar.gz rails-0e909cd3078bab352eb741426024334afe0d6820.tar.bz2 rails-0e909cd3078bab352eb741426024334afe0d6820.zip | |
Make TimeZone#parse behave more like Time#parse.
Namely, if the mday is omitted but any other upper components are, then instead
of supplying the mday from the current time, it defaults to 1.
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/time_zone_test.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb index 79ec57af2b..37276b71e1 100644 --- a/activesupport/test/time_zone_test.rb +++ b/activesupport/test/time_zone_test.rb @@ -254,6 +254,13 @@ class TimeZoneTest < ActiveSupport::TestCase assert_equal Time.utc(1999,12,31,19), twz.time end + def test_parse_with_day_omitted + zone = ActiveSupport::TimeZone['Eastern Time (US & Canada)'] + zone.stubs(:now).returns zone.local(1999, 12, 31) + twz = zone.parse('Feb') + assert_equal Time.utc(1999, 2, 1), twz.time + end + def test_parse_should_not_black_out_system_timezone_dst_jump with_env_tz('EET') do zone = ActiveSupport::TimeZone['Pacific Time (US & Canada)'] |