Merge remote-tracking branch 'openstreetmap/pull/1312'
This commit is contained in:
Tom Hughes
commit
3123822bba
11 changed files with 227 additions and 371 deletions
142
test/fixtures/note_comments.yml
vendored
142
test/fixtures/note_comments.yml
vendored
|
|
@ -1,142 +0,0 @@
|
|||
t1:
|
||||
id: 1
|
||||
note_id: 1
|
||||
visible: true
|
||||
event: opened
|
||||
created_at: 2007-01-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'This is the initial description of the note 1'
|
||||
|
||||
t2:
|
||||
id: 2
|
||||
note_id: 2
|
||||
visible: true
|
||||
event: opened
|
||||
created_at: 2007-01-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'This is the initial description of the note 2'
|
||||
|
||||
t3:
|
||||
id: 3
|
||||
note_id: 2
|
||||
visible: true
|
||||
event: opened
|
||||
created_at: 2007-02-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'This is an additional comment for note 2'
|
||||
|
||||
t4:
|
||||
id: 4
|
||||
note_id: 3
|
||||
visible: true
|
||||
event: opened
|
||||
created_at: 2007-01-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'This is the initial comment for note 3'
|
||||
|
||||
t5:
|
||||
id: 5
|
||||
note_id: 4
|
||||
visible: true
|
||||
event: opened
|
||||
created_at: 2007-01-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'Spam for note 4'
|
||||
|
||||
t6:
|
||||
id: 6
|
||||
note_id: 5
|
||||
visible: true
|
||||
event: opened
|
||||
created_at: 2007-01-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'Valid comment for note 5'
|
||||
|
||||
t7:
|
||||
id: 7
|
||||
note_id: 5
|
||||
visible: false
|
||||
event: commented
|
||||
created_at: 2007-02-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'Spam for note 5'
|
||||
|
||||
t8:
|
||||
id: 8
|
||||
note_id: 5
|
||||
visible: true
|
||||
event: commented
|
||||
created_at: 2007-02-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'Another valid comment for note 5'
|
||||
|
||||
t9:
|
||||
id: 9
|
||||
note_id: 6
|
||||
visible: true
|
||||
event: opened
|
||||
created_at: 2007-01-01 00:00:00
|
||||
author_id: 1
|
||||
body: 'This is a note with from a logged-in user'
|
||||
|
||||
t10:
|
||||
id: 10
|
||||
note_id: 6
|
||||
visible: true
|
||||
event: commented
|
||||
created_at: 2007-02-01 00:00:00
|
||||
author_id: 4
|
||||
body: 'A comment from another logged-in user'
|
||||
|
||||
t11:
|
||||
id: 11
|
||||
note_id: 7
|
||||
visible: true
|
||||
event: opened
|
||||
created_at: 2007-01-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'Initial note description'
|
||||
|
||||
t12:
|
||||
id: 12
|
||||
note_id: 7
|
||||
visible: true
|
||||
event: commented
|
||||
created_at: 2007-02-01 00:00:00
|
||||
author_ip: '192.168.1.1'
|
||||
body: 'A comment description'
|
||||
|
||||
t13:
|
||||
id: 13
|
||||
note_id: 7
|
||||
visible: true
|
||||
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'
|
||||
113
test/fixtures/notes.yml
vendored
113
test/fixtures/notes.yml
vendored
|
|
@ -1,113 +0,0 @@
|
|||
# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
|
||||
<% SCALE = 10000000 unless defined?(SCALE) %>
|
||||
|
||||
open_note:
|
||||
id: 1
|
||||
latitude: <%= 1*SCALE %>
|
||||
longitude: <%= 1*SCALE %>
|
||||
status: open
|
||||
tile: <%= QuadTile.tile_for_point(1,1) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-01-01 00:00:00
|
||||
|
||||
open_note_with_comment:
|
||||
id: 2
|
||||
latitude: <%= 1.1*SCALE %>
|
||||
longitude: <%= 1.1*SCALE %>
|
||||
status: open
|
||||
tile: <%= QuadTile.tile_for_point(1.1,1.1) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-02-01 00:00:00
|
||||
|
||||
closed_note_with_comment:
|
||||
id: 3
|
||||
latitude: <%= 1.2*SCALE %>
|
||||
longitude: <%= 1.2*SCALE %>
|
||||
status: closed
|
||||
tile: <%= QuadTile.tile_for_point(1.2,1.2) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
closed_at: 2007-03-01 00:00:00
|
||||
|
||||
hidden_note_with_comment:
|
||||
id: 4
|
||||
latitude: <%= 1.3*SCALE %>
|
||||
longitude: <%= 1.3*SCALE %>
|
||||
status: hidden
|
||||
tile: <%= QuadTile.tile_for_point(1.3,1.3) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
|
||||
note_with_hidden_comment:
|
||||
id: 5
|
||||
latitude: <%= 1.4*SCALE %>
|
||||
longitude: <%= 1.4*SCALE %>
|
||||
status: open
|
||||
tile: <%= QuadTile.tile_for_point(1.4,1.4) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
|
||||
note_with_comments_by_users:
|
||||
id: 6
|
||||
latitude: <%= 1.5*SCALE %>
|
||||
longitude: <%= 1.5*SCALE %>
|
||||
status: open
|
||||
tile: <%= QuadTile.tile_for_point(1.5,1.5) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
|
||||
note_closed_by_user:
|
||||
id: 7
|
||||
latitude: <%= 1.6*SCALE %>
|
||||
longitude: <%= 1.6*SCALE %>
|
||||
status: closed
|
||||
tile: <%= QuadTile.tile_for_point(1.6,1.6) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
closed_at: 2007-03-01 00:00:00
|
||||
|
||||
hidden_note_with_comment:
|
||||
id: 4
|
||||
latitude: <%= 1.3*SCALE %>
|
||||
longitude: <%= 1.3*SCALE %>
|
||||
status: hidden
|
||||
tile: <%= QuadTile.tile_for_point(1.3,1.3) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
|
||||
note_with_hidden_comment:
|
||||
id: 5
|
||||
latitude: <%= 1.4*SCALE %>
|
||||
longitude: <%= 1.4*SCALE %>
|
||||
status: open
|
||||
tile: <%= QuadTile.tile_for_point(1.4,1.4) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
|
||||
note_with_comments_by_users:
|
||||
id: 6
|
||||
latitude: <%= 1.5*SCALE %>
|
||||
longitude: <%= 1.5*SCALE %>
|
||||
status: open
|
||||
tile: <%= QuadTile.tile_for_point(1.5,1.5) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
|
||||
note_closed_by_user:
|
||||
id: 7
|
||||
latitude: <%= 1.6*SCALE %>
|
||||
longitude: <%= 1.6*SCALE %>
|
||||
status: closed
|
||||
tile: <%= QuadTile.tile_for_point(1.6,1.6) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
closed_at: 2007-03-01 00:00:00
|
||||
|
||||
hidden_note_with_comment_by_user:
|
||||
id: 8
|
||||
latitude: <%= 1.3*SCALE %>
|
||||
longitude: <%= 1.3*SCALE %>
|
||||
status: hidden
|
||||
tile: <%= QuadTile.tile_for_point(1.3,1.3) %>
|
||||
created_at: 2007-01-01 00:00:00
|
||||
updated_at: 2007-03-01 00:00:00
|
||||
Loading…
Add table
Add a link
Reference in a new issue