X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c54471ee33f79b7119eb284b03a845813a058876..5143fbcd5bbaf59e498fff4ac7dd797342a69a04:/test/functional/changeset_controller_test.rb

diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index 4669df07d..edc2aee93 100644
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -217,6 +217,29 @@ EOF
     assert_equal false, Relation.find(current_relations(:used_relation).id).visible
   end
 
+  ##
+  # test uploading a delete with no lat/lon, as they are optional in
+  # the osmChange spec.
+  def test_upload_nolatlon_delete
+    basic_authorization "test@openstreetmap.org", "test"
+
+    node = current_nodes(:visible_node)
+    cs = changesets(:normal_user_first_change)
+    diff = "<osmChange><delete><node id='#{node.id}' version='#{node.version}' changeset='#{cs.id}'/></delete></osmChange>"
+
+    # upload it
+    content diff
+    post :upload, :id => cs.id
+    assert_response :success, 
+      "can't upload a deletion diff to changeset: #{@response.body}"
+
+    # check the response is well-formed
+    assert_select "diffResult>node", 1
+
+    # check that everything was deleted
+    assert_equal false, Node.find(node.id).visible
+  end
+
   ##
   # test that deleting stuff in a transaction doesn't bypass the checks
   # to ensure that used elements are not deleted.
@@ -530,6 +553,24 @@ EOF
       "shouldn't be able to re-use placeholder IDs"
   end
 
+  ##
+  # test for more issues in #1568
+  def test_upload_empty_invalid
+    basic_authorization "test@openstreetmap.org", "test"
+
+    [ "<osmChange/>",
+      "<osmChange></osmChange>",
+      "<osmChange><modify/></osmChange>",
+      "<osmChange><modify></modify></osmChange>"
+    ].each do |diff|
+      # upload it
+      content diff
+      post :upload, :id => 1
+      assert_response(:success, "should be able to upload " +
+                      "empty changeset: " + diff)
+    end
+  end
+
   ##
   # when we make some simple changes we get the same changes back from the 
   # diff download.