Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed that Time#midnight would have a non-zero usec on some platforms #…

…1836

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit b4c34f7b2b18720381b3c8cfa79f66a530b3ed0b 1 parent eda1719
@jamis jamis authored
View
2  activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Fixed that Time#midnight would have a non-zero usec on some platforms #1836
+
* Fixed inflections of "index/indices" #1766 [damn_pepe@gmail.com]
* Added stripping of _id to String#humanize, so "employee_id" becomes "Employee" #1574 [Justin French]
View
4 activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -101,7 +101,7 @@ def next_week(day = :monday)
# Returns a new Time representing the start of the day (0:00)
def beginning_of_day
- self - self.seconds_since_midnight
+ (self - self.seconds_since_midnight).change(:usec => 0)
end
alias :midnight :beginning_of_day
alias :at_midnight :beginning_of_day
@@ -132,4 +132,4 @@ def tomorrow
end
end
end
-end
+end
View
9 activesupport/test/core_ext/time_ext_test.rb
@@ -130,4 +130,11 @@ def test_to_date
def test_to_time
assert_equal Time.local(2005, 2, 21, 17, 44, 30), Time.local(2005, 2, 21, 17, 44, 30).to_time
end
-end
+
+ # NOTE: this test seems to fail (changeset 1958) only on certain platforms,
+ # like OSX, and FreeBSD 5.4.
+ def test_fp_inaccuracy_ticket_1836
+ midnight = Time.local(2005, 2, 21, 0, 0, 0)
+ assert_equal midnight.midnight, (midnight + 1.hour + 0.000001).midnight
+ end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.