Merge branch 'master' into notes

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

diff --git a/test/fixtures/diary_entries.yml b/test/fixtures/diary_entries.yml
index 5d07e5fa7137c65bce0009b7daadc005f26d1697..864dc250d6cbae7924b0749e9666d07b5f9ce44e 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,18 @@ 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