Merge branch 'master' into openstreetbugs

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

diff --git a/test/fixtures/ways.yml b/test/fixtures/ways.yml
index 4f0af985482695991dd8d36fb6aaafad41d02691..95c001c30fcaa6e34dd2298f94e27fcc42cb676b 100644 (file)
--- a/test/fixtures/ways.yml
+++ b/test/fixtures/ways.yml
@@ -1,49 +1,55 @@
 visible_way:
 visible_way:

-  id: 1
-  changeset_id: 1
+  way_id: 1
+  changeset_id: 2

   timestamp: 2007-01-01 00:00:00
   timestamp: 2007-01-01 00:00:00

-  visible: 1
+  visible: true

   version: 1
 
 invisible_way:
   version: 1
 
 invisible_way:

-  id: 2
-  changeset_id: 1
+  way_id: 2
+  changeset_id: 2

   timestamp: 2007-01-01 00:00:00
   timestamp: 2007-01-01 00:00:00

-  visible: 0
+  visible: false

   version: 1
 
 used_way:
   version: 1
 
 used_way:

-  id: 3
-  changeset_id: 1
+  way_id: 3
+  changeset_id: 2

   timestamp: 2007-01-01 00:00:00
   timestamp: 2007-01-01 00:00:00

-  visible: 1
+  visible: true

   version: 1
 
 way_with_versions_v1:
   version: 1
 
 way_with_versions_v1:

-  id: 4
+  way_id: 4

   changeset_id: 4
   timestamp: 2008-01-01 00:01:00
   changeset_id: 4
   timestamp: 2008-01-01 00:01:00

-  visible: 1
+  visible: true

   version: 1
 
 way_with_versions_v2:
   version: 1
 
 way_with_versions_v2:

-  id: 4
+  way_id: 4

   changeset_id: 4
   timestamp: 2008-01-01 00:02:00
   changeset_id: 4
   timestamp: 2008-01-01 00:02:00

-  visible: 1
+  visible: true

   version: 2
 
 way_with_versions:
   version: 2
 
 way_with_versions:

-  id: 4
+  way_id: 4

   changeset_id: 4
   timestamp: 2008-01-01 00:03:00
   changeset_id: 4
   timestamp: 2008-01-01 00:03:00

-  visible: 1
+  visible: true

   version: 3
 
 way_with_versions_v4:
   version: 3
 
 way_with_versions_v4:

-  id: 4
+  way_id: 4

   changeset_id: 4
   timestamp: 2008-01-01 00:04:00
   changeset_id: 4
   timestamp: 2008-01-01 00:04:00

-  visible: 1
+  visible: true

   version: 4
 
   version: 4
 

+way_with_duplicate_nodes:
+  way_id: 5
+  changeset_id: 2
+  timestamp: 2007-01-01 00:00:00
+  visible: true
+  version: 1