diff options
author | Yehuda Katz <wycats@gmail.com> | 2009-01-05 01:10:55 -0800 |
---|---|---|
committer | Yehuda Katz <wycats@gmail.com> | 2009-01-05 01:10:55 -0800 |
commit | db619c4a4115d5eeca9473f8f77f34c877e4e1dd (patch) | |
tree | 18c86d54f27884f5f03db0eba86665d4563cfa7e /activesupport/test | |
parent | ca54cc5df72a8bd7660d5be8333dcee2b6949257 (diff) | |
download | rails-db619c4a4115d5eeca9473f8f77f34c877e4e1dd.tar.gz rails-db619c4a4115d5eeca9473f8f77f34c877e4e1dd.tar.bz2 rails-db619c4a4115d5eeca9473f8f77f34c877e4e1dd.zip |
Sync 'rails/rails/master'
Diffstat (limited to 'activesupport/test')
-rw-r--r-- | activesupport/test/core_ext/time_with_zone_test.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/activesupport/test/core_ext/time_with_zone_test.rb b/activesupport/test/core_ext/time_with_zone_test.rb index dc36336239..7c8fb7dd94 100644 --- a/activesupport/test/core_ext/time_with_zone_test.rb +++ b/activesupport/test/core_ext/time_with_zone_test.rb @@ -256,6 +256,15 @@ class TimeWithZoneTest < Test::Unit::TestCase twz2 = ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) assert_equal 86_400.0, twz2 - twz1 end + + def test_minus_with_datetime + assert_equal 86_400.0, ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) - DateTime.civil(2000, 1, 1) + end + + def test_minus_with_wrapped_datetime + assert_equal 86_400.0, ActiveSupport::TimeWithZone.new( DateTime.civil(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) - Time.utc(2000, 1, 1) + assert_equal 86_400.0, ActiveSupport::TimeWithZone.new( DateTime.civil(2000, 1, 2), ActiveSupport::TimeZone['UTC'] ) - DateTime.civil(2000, 1, 1) + end def test_plus_and_minus_enforce_spring_dst_rules silence_warnings do # silence warnings raised by tzinfo gem |