aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-07-20 04:04:47 -0700
committerXavier Noria <fxn@hashref.com>2011-07-20 04:04:47 -0700
commit64268c5dd1f908aceaecea1a5c61314dd2f2efc3 (patch)
treeeeb791c4dd4195850c292e4c4cd644112c922564
parent4636638bb998cad64e165fe644990db9c92c48a5 (diff)
parentf92cefa95f44bcd550c402a7f5ba914f3bd783cc (diff)
downloadrails-64268c5dd1f908aceaecea1a5c61314dd2f2efc3.tar.gz
rails-64268c5dd1f908aceaecea1a5c61314dd2f2efc3.tar.bz2
rails-64268c5dd1f908aceaecea1a5c61314dd2f2efc3.zip
Merge pull request #2165 from joshk/fixtures_test_fix
Timezone fixtures test correction
-rw-r--r--activerecord/test/fixtures/pirates.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/fixtures/pirates.yml b/activerecord/test/fixtures/pirates.yml
index abb91101da..a47d894249 100644
--- a/activerecord/test/fixtures/pirates.yml
+++ b/activerecord/test/fixtures/pirates.yml
@@ -5,5 +5,5 @@ blackbeard:
redbeard:
catchphrase: "Avast!"
parrot: louis
- created_on: <%= 2.weeks.ago.to_s(:db) %>
- updated_on: <%= 2.weeks.ago.to_s(:db) %>
+ created_on: <%= 2.weeks.ago.utc.to_s(:db) %>
+ updated_on: <%= 2.weeks.ago.utc.to_s(:db) %>