From 85eb27079f523eb0dcaff2b1e40b56aac5b91e25 Mon Sep 17 00:00:00 2001 From: Benjamin Meichsner Date: Fri, 6 Feb 2009 19:30:35 +0100 Subject: [PATCH] Fixed wrong datetime-settings in fixtures. --- test/fixtures/article_prices.yml | 5 +++++ test/fixtures/financial_transactions.yml | 4 ++-- test/fixtures/groups.yml | 2 +- test/fixtures/users.yml | 2 ++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/test/fixtures/article_prices.yml b/test/fixtures/article_prices.yml index 24438ee0..429e3e23 100644 --- a/test/fixtures/article_prices.yml +++ b/test/fixtures/article_prices.yml @@ -19,24 +19,28 @@ banana1: price: 1.45 tax: 7.0 unit_quantity: 18 + created_at: <%= Time.now.to_s(:db) %> banana2: article: banana price: 1.35 tax: 7.0 unit_quantity: 18 + created_at: <%= Time.now.to_s(:db) %> kiwi1: article: kiwi price: 1.11 tax: 7.0 unit_quantity: 10 + created_at: <%= Time.now.to_s(:db) %> potatoe1: article: potatoe price: 1.33 tax: 7.0 unit_quantity: 25 + created_at: <%= Time.now.to_s(:db) %> applejuice1: article: applejuice @@ -44,3 +48,4 @@ applejuice1: tax: 7.0 unit_quantity: 1 deposit: 0.15 + created_at: <%= Time.now.to_s(:db) %> diff --git a/test/fixtures/financial_transactions.yml b/test/fixtures/financial_transactions.yml index 6db5cfb0..247d2451 100644 --- a/test/fixtures/financial_transactions.yml +++ b/test/fixtures/financial_transactions.yml @@ -17,10 +17,10 @@ bananas1: amount: 0.00 note: "Deposit for 3 people: 15,-€" user: admin - created_on: <%= 2.weeks.ago.strftime("%d.%m.%Y") %> + created_on: <%= 2.weeks.ago.to_s(:db) %> bananas2: ordergroup: bananas amount: 100.00 note: Paying in from <%= 1.weeks.ago.strftime("%d.%m.%Y") %> - created_on: <%= 1.weeks.ago.strftime("%d.%m.%Y") %> + created_on: <%= 1.weeks.ago.to_s(:db) %> diff --git a/test/fixtures/groups.yml b/test/fixtures/groups.yml index 8f8fbf6d..8ab4f5f1 100644 --- a/test/fixtures/groups.yml +++ b/test/fixtures/groups.yml @@ -40,7 +40,7 @@ bananas: type: Ordergroup name: Banangroup account_balance: 100.00 - account_updated: <%= 1.weeks.ago.strftime("%d.%m.%Y") %> + account_updated: <%= 1.weeks.ago.to_s(:db) %> contact_person: Tim contact_phone: 030 123132456 contact_address: Waldermarstrasse 43, 10988 Berlin diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 4b6d4f97..707f01c1 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -25,6 +25,7 @@ admin: email: admin@foo.test password_hash: a3c77e64311ad37161e582b28737d1e420962538 password_salt: LNpP/lca + created_on: <%= 1.day.ago.to_s(:db) %> test: nick: test first_name: Tim @@ -32,3 +33,4 @@ test: email: test@foo.test password_hash: 5549cd54032a72435037893b02d95ebef13cdc57 password_salt: DxnbIF1h + created_on: <%= Time.now.to_s(:db) %>