Merge branch 'redesign'

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

diff --git a/test/fixtures/ways.yml b/test/fixtures/ways.yml
index 090508702cfbe87ca60cfe299d2cb0e490faaf6c..dfb48b4506ca3032ad001dc8c998b5e378462118 100644 (file)
--- a/test/fixtures/ways.yml
+++ b/test/fixtures/ways.yml
@@ -1,55 +1,85 @@
 visible_way:
 visible_way:

-  id: 1
+  way_id: 1

   changeset_id: 2
   timestamp: 2007-01-01 00:00:00
   visible: true
   version: 1
 
 invisible_way:
   changeset_id: 2
   timestamp: 2007-01-01 00:00:00
   visible: true
   version: 1
 
 invisible_way:

-  id: 2
+  way_id: 2

   changeset_id: 2
   timestamp: 2007-01-01 00:00:00
   visible: false
   version: 1
 
 used_way:
   changeset_id: 2
   timestamp: 2007-01-01 00:00:00
   visible: false
   version: 1
 
 used_way:

-  id: 3
+  way_id: 3

   changeset_id: 2
   timestamp: 2007-01-01 00:00:00
   visible: true
   version: 1
 
 way_with_versions_v1:
   changeset_id: 2
   timestamp: 2007-01-01 00:00:00
   visible: true
   version: 1
 
 way_with_versions_v1:

-  id: 4
+  way_id: 4

   changeset_id: 4
   timestamp: 2008-01-01 00:01:00
   visible: true
   version: 1
 
 way_with_versions_v2:
   changeset_id: 4
   timestamp: 2008-01-01 00:01:00
   visible: true
   version: 1
 
 way_with_versions_v2:

-  id: 4
+  way_id: 4

   changeset_id: 4
   timestamp: 2008-01-01 00:02:00
   visible: true
   version: 2
 
   changeset_id: 4
   timestamp: 2008-01-01 00:02:00
   visible: true
   version: 2
 

-way_with_versions:
-  id: 4
+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:
   changeset_id: 4
   timestamp: 2008-01-01 00:03:00
   visible: true
   version: 3
 
 way_with_versions_v4:

-  id: 4
+  way_id: 4

   changeset_id: 4
   timestamp: 2008-01-01 00:04:00
   visible: true
   version: 4
 
 way_with_duplicate_nodes:
   changeset_id: 4
   timestamp: 2008-01-01 00:04:00
   visible: true
   version: 4
 
 way_with_duplicate_nodes:

-  id: 5
+  way_id: 5

   changeset_id: 2
   timestamp: 2007-01-01 00:00:00
   visible: true
   version: 1
   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