Merge remote-tracking branch 'upstream/master' into vagrant

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

diff --git a/test/fixtures/diary_comments.yml b/test/fixtures/diary_comments.yml
index 8bb9f49bd3b084d3abea0ad45f7f16eb849698f2..247fc3abd484e5da29dddbdfdc93339e04fce0fd 100644 (file)
--- a/test/fixtures/diary_comments.yml
+++ b/test/fixtures/diary_comments.yml
@@ -5,3 +5,31 @@ comment_for_geo_post:
   body: Some comment text
   created_at: "2008-11-08 09:45:34"
   updated_at: "2008-11-08 10:34:34"
   body: Some comment text
   created_at: "2008-11-08 09:45:34"
   updated_at: "2008-11-08 10:34:34"

+  visible: true
+
+comment_by_suspended_user:
+  id: 2
+  diary_entry_id: 2
+  user_id: 10
+  body: Some comment text
+  created_at: "2008-11-08 09:45:34"
+  updated_at: "2008-11-08 10:34:34"
+  visible: true
+
+comment_by_deleted_user:
+  id: 3
+  diary_entry_id: 2
+  user_id: 11
+  body: Some comment text
+  created_at: "2008-11-08 09:45:34"
+  updated_at: "2008-11-08 10:34:34"
+  visible: true
+
+hidden_comment:
+  id: 4
+  diary_entry_id: 2
+  user_id: 2
+  body: Some comment text
+  created_at: "2008-11-08 09:45:34"
+  updated_at: "2008-11-08 10:34:34"
+  visible: false