diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2016-10-22 00:12:47 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 00:12:47 -0300 |
| commit | 7bbd3e68ed137af2adf33e8ad06aaa8c1b7d7069 (patch) | |
| tree | 16390b22b1ba1e581f17f0b1949105b726b1f2fc /activesupport/test | |
| parent | 397025db76c68a8916ce992d2cf7b0df9288320a (diff) | |
| parent | 07ffe7a6211b2bac59f385f4a0a67d11e4d42c24 (diff) | |
| download | rails-7bbd3e68ed137af2adf33e8ad06aaa8c1b7d7069.tar.gz rails-7bbd3e68ed137af2adf33e8ad06aaa8c1b7d7069.tar.bz2 rails-7bbd3e68ed137af2adf33e8ad06aaa8c1b7d7069.zip | |
Merge pull request #26843 from denisovlev/strptime_timestamps
Fix `ActiveSupport::TimeZone#strptime` cannot parse timestamps (%Q, %s)
Diffstat (limited to 'activesupport/test')
| -rw-r--r-- | activesupport/test/time_zone_test.rb | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb index 76fee1fdd4..bd29584478 100644 --- a/activesupport/test/time_zone_test.rb +++ b/activesupport/test/time_zone_test.rb @@ -395,6 +395,24 @@ class TimeZoneTest < ActiveSupport::TestCase end end + def test_strptime_with_timestamp_seconds + with_env_tz "US/Eastern" do + zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"] + time_str = "1470272280" + time = zone.strptime(time_str, "%s") + assert_equal Time.at(1470272280), time + end + end + + def test_strptime_with_timestamp_milliseconds + with_env_tz "US/Eastern" do + zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"] + time_str = "1470272280000" + time = zone.strptime(time_str, "%Q") + assert_equal Time.at(1470272280), time + end + end + def test_utc_offset_lazy_loaded_from_tzinfo_when_not_passed_in_to_initialize tzinfo = TZInfo::Timezone.get("America/New_York") zone = ActiveSupport::TimeZone.create(tzinfo.name, nil, tzinfo) |