Skip to content
Sign up
This repository

public / rails Octocat-spinner-32 forked from rails/rails

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix TimeWithZone#to_time to return self 

A previous commit (7872cc9) changed it to return utc to simplify the Time#<==>
override. An alternative method acheives the same result while
preserving original behaviour.
  • Loading branch information...
commit 0784a7c4ce9b603427fd02ab47b530952ff3d021 1 parent ed10107
Adam Meehan authored

Showing 3 changed files with 4 additions and 3 deletions. Show Diff Stats Hide Diff Stats

  1. 3  activesupport/lib/active_support/core_ext/time/calculations.rb
  2. 2  activesupport/lib/active_support/time_with_zone.rb
  3. 2  activesupport/test/core_ext/time_with_zone_test.rb
3  activesupport/lib/active_support/core_ext/time/calculations.rb
View 
@@ -379,9 +379,10 @@ def minus_with_coercion(other)
379 379 
   # Layers additional behavior on Time#<=> so that DateTime and ActiveSupport::TimeWithZone instances
380 380 
   # can be chronologically compared with a Time
381 381 
   def compare_with_coercion(other)
  382 
+    other = other.comparable_time if other.respond_to?(:comparable_time)
382 383 
     # we're avoiding Time#to_datetime cause it's expensive
383 384 
     if other.is_a?(Time)
384   
-      compare_without_coercion(other.to_time)
  385 
+      compare_without_coercion(other)
385 386 
     else
386 387 
       to_datetime <=> other
387 388 
     end
2  activesupport/lib/active_support/time_with_zone.rb
View 
@@ -279,7 +279,7 @@ def to_i
279 279
280 280 
     # A TimeWithZone acts like a Time, so just return +self+.
281 281 
     def to_time
282   
-      utc
  282 
+      self
283 283 
     end
284 284
285 285 
     def to_datetime
2  activesupport/test/core_ext/time_with_zone_test.rb
View 
@@ -319,7 +319,7 @@ def test_to_i_with_wrapped_datetime
319 319 
   end
320 320
321 321 
   def test_to_time
322   
-    assert_equal @twz, @twz.to_time
  322 
+    assert @twz.equal?(@twz.to_time)
323 323 
   end
324 324
325 325 
   def test_to_date

0 notes on commit 0784a7c

Please sign in to comment.
Something went wrong with that request. Please try again.