Merge changes from trunk 7673:8632.

[rails.git] / test / fixtures / messages.yml

diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
index d66ebd6f030c363c630eec5e42746248c38d113c..feab6536ef91ea83ea57db374571630224fd8448 100644 (file)
--- a/test/fixtures/messages.yml
+++ b/test/fixtures/messages.yml
@@ -1,12 +1,16 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
-  id: 1
-  from_user_id: users(:normal_user).id
+  sender: normal_user
   title: test message 1
   body: some body text
   sent_on: "2008-05-01 12:34:56"
   message_read: false
-  to_user_id: users(:second_user).id
+  recipient: second_user
   
 two:
-  id: 2
+  sender: second_user
+  title: test message 2
+  body: some body test
+  sent_on: "2008-05-02 12:45:23"
+  message_read: true
+  recipient: normal_user