aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2011-07-06 12:23:19 -0700
committerSantiago Pastorino <santiago@wyeworks.com>2011-07-06 12:23:19 -0700
commitd5bd7030e56d3531a1ee7949ddaac691f6b27ed2 (patch)
tree1f7574335b287e5630b52f00e3d1c6f55508d9fd /activerecord/test
parent61913684a2be30190b49d4f8ac3314b3f2556273 (diff)
parent3fc53e5ea1074091b4242521d26c5aec1439f98d (diff)
downloadrails-d5bd7030e56d3531a1ee7949ddaac691f6b27ed2.tar.gz
rails-d5bd7030e56d3531a1ee7949ddaac691f6b27ed2.tar.bz2
rails-d5bd7030e56d3531a1ee7949ddaac691f6b27ed2.zip
Merge pull request #1494 from anildigital/master
Fix failing test because of Timezone difference.
Diffstat (limited to 'activerecord/test')
-rw-r--r--activerecord/test/cases/fixtures_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/fixtures_test.rb b/activerecord/test/cases/fixtures_test.rb
index 306b437fb3..854eb86c09 100644
--- a/activerecord/test/cases/fixtures_test.rb
+++ b/activerecord/test/cases/fixtures_test.rb
@@ -589,8 +589,8 @@ class FoxyFixturesTest < ActiveRecord::TestCase
end
def test_preserves_existing_fixture_data
- assert_equal(2.weeks.ago.to_date, pirates(:redbeard).created_on.to_date)
- assert_equal(2.weeks.ago.to_date, pirates(:redbeard).updated_on.to_date)
+ assert_equal(2.weeks.ago.utc.to_date, pirates(:redbeard).created_on.utc.to_date)
+ assert_equal(2.weeks.ago.utc.to_date, pirates(:redbeard).updated_on.utc.to_date)
end
def test_generates_unique_ids