Merge branch 'master' into notes

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

diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
index feab6536ef91ea83ea57db374571630224fd8448..0a54cce874b218d9a42bf7091612aa9a97277c77 100644 (file)
--- a/test/fixtures/messages.yml
+++ b/test/fixtures/messages.yml
@@ -1,16 +1,21 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-one:
-  sender: normal_user
+unread_message:
+  id: 1
+  from_user_id: 1

   title: test message 1
   body: some body text
   sent_on: "2008-05-01 12:34:56"
   message_read: false
   title: test message 1
   body: some body text
   sent_on: "2008-05-01 12:34:56"
   message_read: false

-  recipient: second_user
+  to_user_id: 2
+  from_user_visible: true
+  to_user_visible: true

   
   

-two:
-  sender: second_user
+read_message:
+  id: 2
+  from_user_id: 2

   title: test message 2
   body: some body test
   sent_on: "2008-05-02 12:45:23"
   message_read: true
   title: test message 2
   body: some body test
   sent_on: "2008-05-02 12:45:23"
   message_read: true

-  recipient: normal_user
+  to_user_id: 1
+  from_user_visible: true
+  to_user_visible: true