Merge branch 'master' into notes

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

diff --git a/test/fixtures/ways.yml b/test/fixtures/ways.yml
index c8cf6dcf4d2f6568cffacd5ea0b39336d3b9d151..dfb48b4506ca3032ad001dc8c998b5e378462118 100644 (file)
--- a/test/fixtures/ways.yml
+++ b/test/fixtures/ways.yml
@@ -1,21 +1,85 @@
 visible_way:
-  id: 1
-  user_id: 1
+  way_id: 1
+  changeset_id: 2
   timestamp: 2007-01-01 00:00:00
-  visible: 1
+  visible: true
   version: 1
 
 invisible_way:
-  id: 2
-  user_id: 1
+  way_id: 2
+  changeset_id: 2
   timestamp: 2007-01-01 00:00:00
-  visible: 0
+  visible: false
   version: 1
 
 used_way:
-  id: 3
-  user_id: 1
+  way_id: 3
+  changeset_id: 2
   timestamp: 2007-01-01 00:00:00
-  visible: 0
+  visible: true
   version: 1
 
+way_with_versions_v1:
+  way_id: 4
+  changeset_id: 4
+  timestamp: 2008-01-01 00:01:00
+  visible: true
+  version: 1
+
+way_with_versions_v2:
+  way_id: 4
+  changeset_id: 4
+  timestamp: 2008-01-01 00:02:00
+  visible: true
+  version: 2
+
+way_with_versions_v3:
+  way_id: 4
+  changeset_id: 4
+  timestamp: 2008-01-01 00:03:00
+  visible: true
+  version: 3
+
+way_with_versions_v4:
+  way_id: 4
+  changeset_id: 4
+  timestamp: 2008-01-01 00:04:00
+  visible: true
+  version: 4
+
+way_with_duplicate_nodes:
+  way_id: 5
+  changeset_id: 2
+  timestamp: 2007-01-01 00:00:00
+  visible: true
+  version: 1
+
+way_with_redacted_versions_v1:
+  way_id: 6
+  changeset_id: 4
+  timestamp: 2008-01-01 00:04:10
+  visible: true
+  version: 1
+
+way_with_redacted_versions_v2:
+  way_id: 6
+  changeset_id: 4
+  timestamp: 2008-01-01 00:04:11
+  visible: true
+  version: 2
+  redaction_id: 1
+
+way_with_redacted_versions_v3:
+  way_id: 6
+  changeset_id: 4
+  timestamp: 2008-01-01 00:04:12
+  visible: true
+  version: 3
+  redaction_id: 1
+
+way_with_redacted_versions_v4:
+  way_id: 6
+  changeset_id: 4
+  timestamp: 2008-01-01 00:04:13
+  visible: true
+  version: 4