Merge 16012:16110 from trunk.

[rails.git] / test / functional / relation_controller_test.rb

diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index 10762f48d84911cacc2166aa036cf64ad5514661..19b3617fcf41ddb0dcbc62fb777ee299c589a436 100644 (file)
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -433,10 +433,10 @@ class RelationControllerTest < ActionController::TestCase
     assert_response :bad_request
 
     # try to delete without specifying a changeset
-    content "<osm><relation id='#{current_relations(:visible_relation).id}'/></osm>"
+    content "<osm><relation id='#{current_relations(:visible_relation).id}' version='#{current_relations(:visible_relation).version}' /></osm>"
     delete :delete, :id => current_relations(:visible_relation).id
     assert_response :bad_request
-    assert_match(/You are missing the required changeset in the relation/, @response.body)
+    assert_match(/Changeset id is missing/, @response.body)
 
     # try to delete with an invalid (closed) changeset
     content update_changeset(current_relations(:visible_relation).to_xml,