Merge branch 'master' into redesign

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

diff --git a/test/fixtures/diary_entries.yml b/test/fixtures/diary_entries.yml
index 5d07e5fa7137c65bce0009b7daadc005f26d1697..27717302defc2f4d7002dc4a0f21ad9c0d4e0d99 100644 (file)
--- a/test/fixtures/diary_entries.yml
+++ b/test/fixtures/diary_entries.yml
@@ -7,8 +7,9 @@ normal_user_entry_1:
   updated_at: "2008-11-07 17:43:34"
   latitude: 
   longitude: 
   updated_at: "2008-11-07 17:43:34"
   latitude: 
   longitude: 

-  language: 
-  
+  language_code: en
+  visible: true
+

 normal_user_geo_entry:
   id: 2
   user_id: 1
 normal_user_geo_entry:
   id: 2
   user_id: 1


@@ -18,4 +19,41 @@ normal_user_geo_entry:
   updated_at: "2008-11-07 17:47:34"
   latitude: 51.50763
   longitude: -0.10781
   updated_at: "2008-11-07 17:47:34"
   latitude: 51.50763
   longitude: -0.10781

-  language: 
+  language_code: de
+  visible: true
+
+deleted_entry:
+  id: 3
+  user_id: 1
+  title: Deleted Entry 1
+  body: This is the body of a deleted diary entry.
+  created_at: "2008-11-07 17:43:34"
+  updated_at: "2008-11-07 17:43:34"
+  latitude: 
+  longitude: 
+  language_code: en
+  visible: false
+
+entry_by_suspended_user:
+  id: 4
+  user_id: 10
+  title: Entry by suspended user
+  body: This is the body of a diary entry by a suspended user.
+  created_at: "2008-11-07 17:43:34"
+  updated_at: "2008-11-07 17:43:34"
+  latitude: 
+  longitude: 
+  language_code: en
+  visible: true
+
+entry_by_deleted_user:
+  id: 5
+  user_id: 11
+  title: Entry by deleted user
+  body: This is the body of a diary entry by a deleted user.
+  created_at: "2008-11-07 17:43:34"
+  updated_at: "2008-11-07 17:43:34"
+  latitude: 
+  longitude: 
+  language_code: en
+  visible: true