aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/time_zone_test.rb
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2018-05-30 15:32:37 -0400
committerGitHub <noreply@github.com>2018-05-30 15:32:37 -0400
commite6ef1fe056d7da084a4e8d3b817223e9a28e6200 (patch)
tree95cd282f1006df325150acd41ee42fc6f8f622ee /activesupport/test/time_zone_test.rb
parent16574409f813e2197f88e4a06b527618d64d9ff0 (diff)
parent45762cec03ee1218d5a257d2920678f37bd9bdb4 (diff)
downloadrails-e6ef1fe056d7da084a4e8d3b817223e9a28e6200.tar.gz
rails-e6ef1fe056d7da084a4e8d3b817223e9a28e6200.tar.bz2
rails-e6ef1fe056d7da084a4e8d3b817223e9a28e6200.zip
Merge pull request #33020 from joshpencheon/time_zone_frac_microseconds
Align Time.zone.at method signature with that of Time::at
Diffstat (limited to 'activesupport/test/time_zone_test.rb')
-rw-r--r--activesupport/test/time_zone_test.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/activesupport/test/time_zone_test.rb b/activesupport/test/time_zone_test.rb
index b59f3e9405..6d45a6726d 100644
--- a/activesupport/test/time_zone_test.rb
+++ b/activesupport/test/time_zone_test.rb
@@ -225,6 +225,16 @@ class TimeZoneTest < ActiveSupport::TestCase
assert_equal secs, twz.to_f
end
+ def test_at_with_microseconds
+ zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"]
+ secs = 946684800.0
+ microsecs = 123456.789
+ twz = zone.at(secs, microsecs)
+ assert_equal zone, twz.time_zone
+ assert_equal secs, twz.to_i
+ assert_equal 123456789, twz.nsec
+ end
+
def test_iso8601
zone = ActiveSupport::TimeZone["Eastern Time (US & Canada)"]
twz = zone.iso8601("1999-12-31T19:00:00")