aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/cases
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-17 10:19:33 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-17 14:47:40 -0300
commitd6dbd7fbbcb38c7d34a0928bde2bfc7ce21618f0 (patch)
tree4b92d7f77dfe6307dc95552a8a806edbb5f47ada /activerecord/test/cases
parent25f65498c13e9a094eeaae1bd9e9dd19b6adfad4 (diff)
downloadrails-d6dbd7fbbcb38c7d34a0928bde2bfc7ce21618f0.tar.gz
rails-d6dbd7fbbcb38c7d34a0928bde2bfc7ce21618f0.tar.bz2
rails-d6dbd7fbbcb38c7d34a0928bde2bfc7ce21618f0.zip
Merge pull request #7352 from aripollak/microsecond-timestamp
Fix occasional microsecond conversion inaccuracy Conflicts: activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/test/cases')
-rw-r--r--activerecord/test/cases/base_test.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb
index 2fd0d59e17..fc33438569 100644
--- a/activerecord/test/cases/base_test.rb
+++ b/activerecord/test/cases/base_test.rb
@@ -205,6 +205,7 @@ class BasicsTest < ActiveRecord::TestCase
assert_equal 11, Topic.find(1).written_on.sec
assert_equal 223300, Topic.find(1).written_on.usec
assert_equal 9900, Topic.find(2).written_on.usec
+ assert_equal 129346, Topic.find(3).written_on.usec
end
end