Merge branch 'master' into openid

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

diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
index feab6536ef91ea83ea57db374571630224fd8448..22fab186322bca351586e0297f3d89aa98b4b15a 100644 (file)
--- a/test/fixtures/messages.yml
+++ b/test/fixtures/messages.yml
@@ -1,16 +1,16 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
 one:

-  sender: normal_user
+  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

   
 two:
   
 two:

-  sender: second_user
+  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