Updating the fixtures for the new changesets

diff --git a/test/fixtures/changesets.yml b/test/fixtures/changesets.yml
new file mode 100644 (file)
index 0000000..e676ffa
--- /dev/null
+++ b/test/fixtures/changesets.yml
@@ -0,0 +1,13 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+normal_user_first_change:
+  id: 1
+  user_id: 1
+  created_at: "2007-01-01 00:00:00"
+  open: 1
+  
+second_user_first_change:
+  id: 2
+  user_id: 2
+  created_at: "2008-05-01 01:23:45"
+  open: 1
+

diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml
index 19fad704e1ac98c876ad8542d8aad90ed4665027..7407b2983744b8bd6c7d25e53029fb8882055caa 100644 (file)
--- a/test/fixtures/current_nodes.yml
+++ b/test/fixtures/current_nodes.yml
@@ -5,7 +5,7 @@ visible_node:
   id: 1
   latitude: <%= 1*SCALE %>
   longitude: <%= 1*SCALE %>
   id: 1
   latitude: <%= 1*SCALE %>
   longitude: <%= 1*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(1,1) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(1,1) %>


@@ -15,7 +15,7 @@ invisible_node:
   id: 2
   latitude: <%= 2*SCALE %>
   longitude: <%= 2*SCALE %>
   id: 2
   latitude: <%= 2*SCALE %>
   longitude: <%= 2*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 0
   version: 1
   tile: <%= QuadTile.tile_for_point(2,2) %>
   visible: 0
   version: 1
   tile: <%= QuadTile.tile_for_point(2,2) %>


@@ -25,7 +25,7 @@ used_node_1:
   id: 3
   latitude: <%= 3*SCALE %>
   longitude: <%= 3*SCALE %>
   id: 3
   latitude: <%= 3*SCALE %>
   longitude: <%= 3*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(3,3) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(3,3) %>


@@ -35,7 +35,7 @@ used_node_2:
   id: 4
   latitude: <%= 4*SCALE %>
   longitude: <%= 4*SCALE %>
   id: 4
   latitude: <%= 4*SCALE %>
   longitude: <%= 4*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(4,4) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(4,4) %>


@@ -45,7 +45,7 @@ node_used_by_relationship:
   id: 5
   latitude: <%= 5*SCALE %>
   longitude: <%= 5*SCALE %>
   id: 5
   latitude: <%= 5*SCALE %>
   longitude: <%= 5*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(5,5) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(5,5) %>


@@ -55,7 +55,7 @@ node_too_far_north:
   id: 6
   latitude: <%= 90.01*SCALE %>
   longitude: <%= 6*SCALE %>
   id: 6
   latitude: <%= 90.01*SCALE %>
   longitude: <%= 6*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(90.01,6) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(90.01,6) %>


@@ -65,7 +65,7 @@ node_north_limit:
   id: 11
   latitude: <%= 90*SCALE %>
   longitude: <%= 11*SCALE %>
   id: 11
   latitude: <%= 90*SCALE %>
   longitude: <%= 11*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(90,11) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(90,11) %>


@@ -75,7 +75,7 @@ node_too_far_south:
   id: 7
   latitude: <%= -90.01*SCALE %>
   longitude: <%= 7*SCALE %>
   id: 7
   latitude: <%= -90.01*SCALE %>
   longitude: <%= 7*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(-90.01,7) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(-90.01,7) %>


@@ -85,7 +85,7 @@ node_south_limit:
   id: 12
   latitude: <%= -90*SCALE %>
   longitude: <%= 12*SCALE %>
   id: 12
   latitude: <%= -90*SCALE %>
   longitude: <%= 12*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(-90,12) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(-90,12) %>


@@ -95,7 +95,7 @@ node_too_far_west:
   id: 8
   latitude: <%= 8*SCALE %>
   longitude: <%= -180.01*SCALE %>
   id: 8
   latitude: <%= 8*SCALE %>
   longitude: <%= -180.01*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(8,-180.01) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(8,-180.01) %>


@@ -105,7 +105,7 @@ node_west_limit:
   id: 13
   latitude: <%= 13*SCALE %>
   longitude: <%= -180*SCALE %>
   id: 13
   latitude: <%= 13*SCALE %>
   longitude: <%= -180*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(13,-180) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(13,-180) %>


@@ -115,7 +115,7 @@ node_too_far_east:
   id: 9
   latitude: <%= 9*SCALE %>
   longitude: <%= 180.01*SCALE %>
   id: 9
   latitude: <%= 9*SCALE %>
   longitude: <%= 180.01*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(9,180.01) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(9,180.01) %>


@@ -125,7 +125,7 @@ node_east_limit:
   id: 14
   latitude: <%= 14*SCALE %>
   longitude: <%= 180*SCALE %>
   id: 14
   latitude: <%= 14*SCALE %>
   longitude: <%= 180*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(14,180) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(14,180) %>


@@ -135,7 +135,7 @@ node_totally_wrong:
   id: 10
   latitude: <%= 200*SCALE %>
   longitude: <%= 200*SCALE %>
   id: 10
   latitude: <%= 200*SCALE %>
   longitude: <%= 200*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(200,200) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(200,200) %>

diff --git a/test/fixtures/current_relations.yml b/test/fixtures/current_relations.yml
index c1f77d4282d36a316fe68159f08579ed611b53d9..510df492c68bd3ef625a8a7010181c05b3ab1739 100644 (file)
--- a/test/fixtures/current_relations.yml
+++ b/test/fixtures/current_relations.yml
@@ -1,17 +1,17 @@
 visible_relation:
   id: 1
 visible_relation:
   id: 1

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 1
 
 invisible_relation:
   id: 2
   timestamp: 2007-01-01 00:00:00
   visible: 1
 
 invisible_relation:
   id: 2

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 0
 
 used_relation:
   id: 3
   timestamp: 2007-01-01 00:00:00
   visible: 0
 
 used_relation:
   id: 3

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 1
   timestamp: 2007-01-01 00:00:00
   visible: 1

diff --git a/test/fixtures/current_ways.yml b/test/fixtures/current_ways.yml
index 9b5b5ab8a0619d2aa1153103501ba1e0ab1495a7..bd31916e2a8bcea0baae7e2576bcc798c09ccfc5 100644 (file)
--- a/test/fixtures/current_ways.yml
+++ b/test/fixtures/current_ways.yml
@@ -1,20 +1,20 @@
 visible_way:
   id: 1
 visible_way:
   id: 1

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1
 
 invisible_way:
   id: 2
   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1
 
 invisible_way:
   id: 2

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1
 
 used_way:
   id: 3
   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1
 
 used_way:
   id: 3

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1
   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1

diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
index 9699e395c79e14f68966aa282b2b630a6b3357e7..ddcf1d8f1c0393044189f316add374579ab31cd8 100644 (file)
--- a/test/fixtures/nodes.yml
+++ b/test/fixtures/nodes.yml
@@ -5,7 +5,7 @@ visible_node:
   id: 1
   latitude: <%= 1*SCALE %>
   longitude: <%= 1*SCALE %>
   id: 1
   latitude: <%= 1*SCALE %>
   longitude: <%= 1*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(1,1) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(1,1) %>


@@ -15,7 +15,7 @@ invisible_node:
   id: 2
   latitude: <%= 2*SCALE %>
   longitude: <%= 2*SCALE %>
   id: 2
   latitude: <%= 2*SCALE %>
   longitude: <%= 2*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 0
   version: 1
   tile: <%= QuadTile.tile_for_point(2,2) %>
   visible: 0
   version: 1
   tile: <%= QuadTile.tile_for_point(2,2) %>


@@ -25,7 +25,7 @@ used_node_1:
   id: 3
   latitude: <%= 3*SCALE %>
   longitude: <%= 3*SCALE %>
   id: 3
   latitude: <%= 3*SCALE %>
   longitude: <%= 3*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(3,3) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(3,3) %>


@@ -35,7 +35,7 @@ used_node_2:
   id: 4
   latitude: <%= 4*SCALE %>
   longitude: <%= 4*SCALE %>
   id: 4
   latitude: <%= 4*SCALE %>
   longitude: <%= 4*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(4,4) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(4,4) %>


@@ -45,7 +45,7 @@ node_used_by_relationship:
   id: 5
   latitude: <%= 5*SCALE %>
   longitude: <%= 5*SCALE %>
   id: 5
   latitude: <%= 5*SCALE %>
   longitude: <%= 5*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(5,5) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(5,5) %>


@@ -55,7 +55,7 @@ node_too_far_north:
   id: 6
   latitude: <%= 90.01*SCALE %>
   longitude: <%= 6*SCALE %>
   id: 6
   latitude: <%= 90.01*SCALE %>
   longitude: <%= 6*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(90.01,6) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(90.01,6) %>


@@ -65,7 +65,7 @@ node_north_limit:
   id: 11
   latitude: <%= 90*SCALE %>
   longitude: <%= 11*SCALE %>
   id: 11
   latitude: <%= 90*SCALE %>
   longitude: <%= 11*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(90,11) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(90,11) %>


@@ -75,7 +75,7 @@ node_too_far_south:
   id: 7
   latitude: <%= -90.01*SCALE %>
   longitude: <%= 7*SCALE %>
   id: 7
   latitude: <%= -90.01*SCALE %>
   longitude: <%= 7*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(-90.01,7) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(-90.01,7) %>


@@ -85,7 +85,7 @@ node_south_limit:
   id: 12
   latitude: <%= -90*SCALE %>
   longitude: <%= 12*SCALE %>
   id: 12
   latitude: <%= -90*SCALE %>
   longitude: <%= 12*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(-90,12) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(-90,12) %>


@@ -95,7 +95,7 @@ node_too_far_west:
   id: 8
   latitude: <%= 8*SCALE %>
   longitude: <%= -180.01*SCALE %>
   id: 8
   latitude: <%= 8*SCALE %>
   longitude: <%= -180.01*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(8,-180.01) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(8,-180.01) %>


@@ -105,7 +105,7 @@ node_west_limit:
   id: 13
   latitude: <%= 13*SCALE %>
   longitude: <%= -180*SCALE %>
   id: 13
   latitude: <%= 13*SCALE %>
   longitude: <%= -180*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(13,-180) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(13,-180) %>


@@ -115,7 +115,7 @@ node_too_far_east:
   id: 9
   latitude: <%= 9*SCALE %>
   longitude: <%= 180.01*SCALE %>
   id: 9
   latitude: <%= 9*SCALE %>
   longitude: <%= 180.01*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(9,180.01) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(9,180.01) %>


@@ -125,7 +125,7 @@ node_east_limit:
   id: 14
   latitude: <%= 14*SCALE %>
   longitude: <%= 180*SCALE %>
   id: 14
   latitude: <%= 14*SCALE %>
   longitude: <%= 180*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(14,180) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(14,180) %>


@@ -135,7 +135,7 @@ node_totally_wrong:
   id: 10
   latitude: <%= 200*SCALE %>
   longitude: <%= 200*SCALE %>
   id: 10
   latitude: <%= 200*SCALE %>
   longitude: <%= 200*SCALE %>

-  user_id: 1
+  changeset_id: 1

   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(200,200) %>
   visible: 1
   version: 1
   tile: <%= QuadTile.tile_for_point(200,200) %>

diff --git a/test/fixtures/relations.yml b/test/fixtures/relations.yml
index cf1d1ff5600718b5db43998900a1d51a8823d62d..e4c3b18fa04c967bb9ffcfe800880b846e2194bd 100644 (file)
--- a/test/fixtures/relations.yml
+++ b/test/fixtures/relations.yml
@@ -1,20 +1,20 @@
 visible_relation:
   id: 1
 visible_relation:
   id: 1

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1
 
 invisible_relation:
   id: 2
   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1
 
 invisible_relation:
   id: 2

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1
 
 used_relation:
   id: 3
   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1
 
 used_relation:
   id: 3

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1
   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1

diff --git a/test/fixtures/ways.yml b/test/fixtures/ways.yml
index c8cf6dcf4d2f6568cffacd5ea0b39336d3b9d151..bb1a43c8073b561083dc076f5647a11c067c1358 100644 (file)
--- a/test/fixtures/ways.yml
+++ b/test/fixtures/ways.yml
@@ -1,20 +1,20 @@
 visible_way:
   id: 1
 visible_way:
   id: 1

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1
 
 invisible_way:
   id: 2
   timestamp: 2007-01-01 00:00:00
   visible: 1
   version: 1
 
 invisible_way:
   id: 2

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1
 
 used_way:
   id: 3
   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1
 
 used_way:
   id: 3

-  user_id: 1
+  changeset_id: 1

   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1
   timestamp: 2007-01-01 00:00:00
   visible: 0
   version: 1