couple of fixes to the changeset upload delete

diff --git a/test/fixtures/current_relation_members.yml b/test/fixtures/current_relation_members.yml
index f6418983ac51cc9acba22f538b14f6422418c0ef..b9703827c7cedbfbb56586026b007e194aae9f25 100644 (file)
--- a/test/fixtures/current_relation_members.yml
+++ b/test/fixtures/current_relation_members.yml
@@ -29,7 +29,7 @@ t5:
   member_id: 5
   
 public_used:
-  id: 4
+  id: 6
   member_role: "used by other relation"
   member_type: "Relation"
   member_id: 5

diff --git a/test/fixtures/relation_members.yml b/test/fixtures/relation_members.yml
index b37e5beae7cb46bd8890de546cc59ee56522c7b4..c65deca32a323947c2b6e2739c14070190ecdbf8 100644 (file)
--- a/test/fixtures/relation_members.yml
+++ b/test/fixtures/relation_members.yml
@@ -31,7 +31,7 @@ t5:
   version: 1
   
 public_used:
-  id: 4
+  id: 6
   member_role: "used by other relation"
   member_type: "Relation"
   member_id: 5

diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index 1e20f640b84963d365bd217e2cea90223d199653..df18256e69e88aa2196bb142dff551303e1c9609 100644 (file)
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -308,8 +308,8 @@ EOF
     diff.root = XML::Node.new "osmChange"
     delete = XML::Node.new "delete"
     diff.root << delete
-    delete << current_relations(:public_used_relation).to_xml_node
     delete << current_relations(:public_visible_relation).to_xml_node
+    delete << current_relations(:public_used_relation).to_xml_node
     delete << current_ways(:used_way).to_xml_node
     delete << current_nodes(:node_used_by_relationship).to_xml_node