Changeset 9079

Timestamp:

03/22/08 18:43:36 (4 months ago)

Author:

gbuesing

Message:

Ensure correct TimeWithZone#to_date

Files:

• trunk/activesupport/CHANGELOG (modified) (1 diff)
• trunk/activesupport/lib/active_support/time_with_zone.rb (modified) (1 diff)
• trunk/activesupport/test/core_ext/time_with_zone_test.rb (modified) (1 diff)

trunk/activesupport/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Ensure correct TimeWithZone#to_date [Geoff Buesing]
-
-* Make TimeWithZone work with tzinfo 0.2.x: use TZInfo::Timezone#zone_identifier alias for #abbreviation, silence warnings on tests. Raise LoadError when TZInfo version is < 0.2 by sniffing for TZInfo::TimeOrDateTime constant. Move all tzinfo-dependent TimeZone tests into uses_tzinfo block [Geoff Buesing]

trunk/activesupport/lib/active_support/time_with_zone.rb

@@ -140 +140 @@
-    end
-    
-
+ to_date
-      define_method(name) do
-        time.__send__(name)

trunk/activesupport/test/core_ext/time_with_zone_test.rb

@@ -255 +255 @@
-      assert_equal @twz, @twz.to_time
-    end
+
+    def test_to_date
+      silence_warnings do # silence warnings raised by tzinfo gem
+        # 1 sec before midnight Jan 1 EST
+        assert_equal Date.new(1999, 12, 31), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 4, 59, 59), TimeZone['Eastern Time (US & Canada)'] ).to_date
+        # midnight Jan 1 EST
+        assert_equal Date.new(2000,  1,  1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 1, 5,  0,  0), TimeZone['Eastern Time (US & Canada)'] ).to_date
+        # 1 sec before midnight Jan 2 EST
+        assert_equal Date.new(2000,  1,  1), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 4, 59, 59), TimeZone['Eastern Time (US & Canada)'] ).to_date
+        # midnight Jan 2 EST
+        assert_equal Date.new(2000,  1,  2), ActiveSupport::TimeWithZone.new( Time.utc(2000, 1, 2, 5,  0,  0), TimeZone['Eastern Time (US & Canada)'] ).to_date
+      end
+    end
-    
-    def test_to_datetime