Merge remote-tracking branch 'openstreetmap/pull/954'

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

diff --git a/test/fixtures/note_comments.yml b/test/fixtures/note_comments.yml
index e078b990ad2b56a17a612f6c3cf15677f3e47783..c4b998cad2b84203fc9e9f05d42f5f961ac350aa 100644 (file)
--- a/test/fixtures/note_comments.yml
+++ b/test/fixtures/note_comments.yml
@@ -2,8 +2,8 @@ t1:
   id: 1
   note_id: 1
   visible: true
+  event: opened
   created_at: 2007-01-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'This is the initial description of the note 1'
 
@@ -11,8 +11,8 @@ t2:
   id: 2
   note_id: 2
   visible: true
+  event: opened
   created_at: 2007-01-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'This is the initial description of the note 2'
 
@@ -20,8 +20,8 @@ t3:
   id: 3
   note_id: 2
   visible: true
+  event: opened
   created_at: 2007-02-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'This is an additional comment for note 2'
 
@@ -29,8 +29,8 @@ t4:
   id: 4
   note_id: 3
   visible: true
+  event: opened
   created_at: 2007-01-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'This is the initial comment for note 3'
 
@@ -38,8 +38,8 @@ t5:
   id: 5
   note_id: 4
   visible: true
+  event: opened
   created_at: 2007-01-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'Spam for note 4'
 
@@ -47,8 +47,8 @@ t6:
   id: 6
   note_id: 5
   visible: true
+  event: opened
   created_at: 2007-01-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'Valid comment for note 5'
 
@@ -56,8 +56,8 @@ t7:
   id: 7
   note_id: 5
   visible: false
+  event: commented
   created_at: 2007-02-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'Spam for note 5'
 
@@ -65,8 +65,8 @@ t8:
   id: 8
   note_id: 5
   visible: true
+  event: commented
   created_at: 2007-02-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'Another valid comment for note 5'
 
@@ -74,8 +74,8 @@ t9:
   id: 9
   note_id: 6
   visible: true
-  created_at: 2007-01-01 00:00:00
   event: opened
+  created_at: 2007-01-01 00:00:00
   author_id: 1
   body: 'This is a note with from a logged-in user'
 
@@ -83,8 +83,8 @@ t10:
   id: 10
   note_id: 6
   visible: true
-  created_at: 2007-02-01 00:00:00
   event: commented
+  created_at: 2007-02-01 00:00:00
   author_id: 4
   body: 'A comment from another logged-in user'
 
@@ -94,7 +94,6 @@ t11:
   visible: true
   event: opened
   created_at: 2007-01-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'Initial note description'
 
@@ -104,7 +103,6 @@ t12:
   visible: true
   event: commented
   created_at: 2007-02-01 00:00:00
-  author_name: 'testname'
   author_ip: '192.168.1.1'
   body: 'A comment description'
 
@@ -115,3 +113,30 @@ t13:
   event: closed
   created_at: 2007-03-01 00:00:00
   author_id: 4
+
+t14:
+  id: 14
+  note_id: 8
+  visible: true
+  event: commented
+  created_at: 2007-02-01 00:00:00
+  author_id: 4
+  body: 'A comment description'
+
+t15:
+  id: 15
+  note_id: 2
+  visible: true
+  event: opened
+  created_at: 2007-01-01 00:00:00
+  author_id: 10
+  body: 'This is a note with from a suspended user'
+
+t16:
+  id: 16
+  note_id: 2
+  visible: true
+  event: opened
+  created_at: 2007-01-01 00:00:00
+  author_id: 11
+  body: 'This is a note with from a deleted user'