Merge branch 'master' into notes

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

diff --git a/test/fixtures/relation_members.yml b/test/fixtures/relation_members.yml
index 27e8b533aa5542ffb1db2d3a35d619c64b79808f..931728dc7b8c843bd20aac074c8d91c4ddd7b218 100644 (file)
--- a/test/fixtures/relation_members.yml
+++ b/test/fixtures/relation_members.yml
@@ -1,24 +1,38 @@
 t1:
 t1:

-  id: 1
+  relation_id: 1

   member_role: "some"
   member_role: "some"

-  member_type: "way"
+  member_type: "Way"

   member_id: 3
   version: 1
 t2:
   member_id: 3
   version: 1
 t2:

-  id: 1
+  relation_id: 1

   member_role: "some"
   member_role: "some"

-  member_type: "node"
+  member_type: "Node"

   member_id: 5
   version: 1
 t3:
   member_id: 5
   version: 1
 t3:

-  id: 1
+  relation_id: 1

   member_role: "some"
   member_role: "some"

-  member_type: "relation"
+  member_type: "Relation"

   member_id: 3
   version: 1
 t4:
   member_id: 3
   version: 1
 t4:

-  id: 3
+  relation_id: 3

   member_role: "some"
   member_role: "some"

-  member_type: "node"
+  member_type: "Node"
+  member_id: 5
+  version: 1
+
+t5:
+  relation_id: 2
+  member_role: "some"
+  member_type: "Node"
+  member_id: 5
+  version: 1
+  
+public_used:
+  relation_id: 6
+  member_role: "used by other relation"
+  member_type: "Relation"

   member_id: 5
   version: 1
   member_id: 5
   version: 1