diff options
author | Andrew White <andrew.white@unboxed.co> | 2016-10-02 17:00:18 +0100 |
---|---|---|
committer | Andrew White <andrew.white@unboxed.co> | 2016-10-02 17:00:18 +0100 |
commit | 6c1dac00dfefd9afd12b64d7f9b5964d8c58d73b (patch) | |
tree | 4bcd313922d08991dd8734902885ef029146e116 /activesupport/test | |
parent | da0fdd6bf529df8806ddb4b97e4bb31c95249e0e (diff) | |
download | rails-6c1dac00dfefd9afd12b64d7f9b5964d8c58d73b.tar.gz rails-6c1dac00dfefd9afd12b64d7f9b5964d8c58d73b.tar.bz2 rails-6c1dac00dfefd9afd12b64d7f9b5964d8c58d73b.zip |
Revert "Merge pull request #26677 from tbalthazar/26644"
Turns out trying to cache on localtime with arguments is too hard
so we'll do it on DateAndTime::Compatibility#to_time instead.
This reverts commit 9ce2d1b1a43fc4ef3db59849b7412d30583a4074, reversing
changes made to 53ede1aff2025d4391d0e05ba471fdaf3110a99c.
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index 5c940da1e3..e35aa6e154 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -54,12 +54,6 @@ class TimeWithZoneTest < ActiveSupport::TestCase assert_instance_of Time, @dt_twz.localtime end - def test_localtime_with_offset - assert_equal 0, @twz.localtime.gmt_offset - assert_equal (-3600), @twz.localtime(-3600).gmt_offset - assert_equal (-7200), @twz.localtime(-7200).gmt_offset - end - def test_utc? assert_equal false, @twz.utc? |