diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2011-07-17 19:44:47 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2011-07-17 19:55:05 +0100 |
| commit | ac97e25235e57a3f9da76d37eaa48c269ad9cf86 (patch) | |
| tree | 7025712af8ce52c0c56185bacc67c8711decb399 /activerecord/test/fixtures | |
| parent | 2f00854d22a833e6a4afe7b12fa5209bc01c8f04 (diff) | |
| download | rails-ac97e25235e57a3f9da76d37eaa48c269ad9cf86.tar.gz rails-ac97e25235e57a3f9da76d37eaa48c269ad9cf86.tar.bz2 rails-ac97e25235e57a3f9da76d37eaa48c269ad9cf86.zip | |
Revert "Fix failure in test_preserves_existing_fixture_data from test/cases/fixtures_test.rb when UTC and local time occur on different dates." I am pretty sure this was an incorrect fix, and it still failed in certain circumstances anyway. I am now unable to reproduce the original failure I was experiencing so will leave it for now and see if this pops up again.
This reverts commit e4479b2f1bc54edf155408d51dd3236955150ce1.
Diffstat (limited to 'activerecord/test/fixtures')
| -rw-r--r-- | activerecord/test/fixtures/pirates.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/fixtures/pirates.yml b/activerecord/test/fixtures/pirates.yml index a47d894249..abb91101da 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.utc.to_s(:db) %> - updated_on: <%= 2.weeks.ago.utc.to_s(:db) %> + created_on: <%= 2.weeks.ago.to_s(:db) %> + updated_on: <%= 2.weeks.ago.to_s(:db) %> |