diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-17 10:19:33 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-08-17 10:19:33 -0700 |
| commit | 8f4ee48687b7b4c2df123a078923f3d5b3b065ec (patch) | |
| tree | d7cabeef7412ae0da3b0539e00a477f51c0f5499 /activerecord/test | |
| parent | cbbf6bf87c9220c3a21f90c2dcdeea044f583d54 (diff) | |
| parent | 53ca22f2e11cd3050d75385bc31b6bb5055a2738 (diff) | |
| download | rails-8f4ee48687b7b4c2df123a078923f3d5b3b065ec.tar.gz rails-8f4ee48687b7b4c2df123a078923f3d5b3b065ec.tar.bz2 rails-8f4ee48687b7b4c2df123a078923f3d5b3b065ec.zip | |
Merge pull request #7352 from aripollak/microsecond-timestamp
Fix occasional microsecond conversion inaccuracy
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/base_test.rb | 1 | ||||
| -rw-r--r-- | activerecord/test/fixtures/topics.yml | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 062f196a12..04b1d75e3e 100644 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -231,6 +231,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 diff --git a/activerecord/test/fixtures/topics.yml b/activerecord/test/fixtures/topics.yml index 93f48aedc4..2b042bd135 100644 --- a/activerecord/test/fixtures/topics.yml +++ b/activerecord/test/fixtures/topics.yml @@ -25,7 +25,7 @@ third: id: 3 title: The Third Topic of the day author_name: Carl - written_on: 2005-07-15t15:28:00.0099+01:00 + written_on: 2012-08-12t20:24:22.129346+00:00 content: I'm a troll approved: true replies_count: 1 |