diff options
| author | simon <simon@zagal.(none)> | 2009-02-09 22:01:16 +0100 |
|---|---|---|
| committer | hukl <hukl@eight.local> | 2009-02-15 20:22:13 +0100 |
| commit | b700b1315afa9b77104cf30ca1aff0c4a33b029d (patch) | |
| tree | 283753e7f7ea7ab6c605987bf9127322630f7ea3 /test | |
| parent | bed876819207e3ae84a285470b39544c2850f38b (diff) | |
* mergin stuff yo, why do i have to do this again?
Diffstat (limited to 'test')
| -rw-r--r-- | test/fixtures/users.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index 3afb3fd..5b32afc 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml | |||
| @@ -1,4 +1,3 @@ | |||
| 1 | |||
| 2 | quentin: | 1 | quentin: |
| 3 | id: 1 | 2 | id: 1 |
| 4 | login: quentin | 3 | login: quentin |
| @@ -13,4 +12,5 @@ aaron: | |||
| 13 | email: aaron@example.com | 12 | email: aaron@example.com |
| 14 | salt: 5be6f9cdd04fd7ab3c91cd32a5334ba2339b8005 | 13 | salt: 5be6f9cdd04fd7ab3c91cd32a5334ba2339b8005 |
| 15 | crypted_password: 740a48caf7dd5ff11318d812d57c0a0928cfbc12 # 'monkey' | 14 | crypted_password: 740a48caf7dd5ff11318d812d57c0a0928cfbc12 # 'monkey' |
| 16 | created_at: <%= 1.days.ago.to_s :db %> \ No newline at end of file | 15 | created_at: <%= 1.days.ago.to_s :db %> |
| 16 | |||