Changeset 8369
- Timestamp:
- 12/10/07 10:05:43 (5 months ago)
- Files:
-
- trunk/activesupport/lib/active_support/values/time_zone.rb (modified) (2 diffs)
- trunk/activesupport/test/time_zone_test.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activesupport/lib/active_support/values/time_zone.rb
r7700 r8369 46 46 # Adjust the given time to the time zone represented by +self+. 47 47 def adjust(time) 48 time = time.to_time 48 time = time.to_time unless time.is_a?(::Time) 49 49 time + utc_offset - time.utc_offset 50 50 end … … 54 54 # local time zone. 55 55 def unadjust(time) 56 time = Time.local(*time.to_time.to_a) 57 time - utc_offset + time.utc_offset 56 time = time.to_time unless time.is_a?(::Time) 57 time = time.localtime 58 time - utc_offset - time.utc_offset 58 59 end 59 60 trunk/activesupport/test/time_zone_test.rb
r7117 r8369 35 35 36 36 def test_adjust_negative 37 zone = TimeZone.create( "Test", -4200 ) 37 zone = TimeZone.create( "Test", -4200 ) # 4200s == 70 mins 38 38 assert_equal Time.utc(2004,7,24,23,55,0), zone.adjust(Time.utc(2004,7,25,1,5,0)) 39 39 end
