X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/da2277505faa4b327df7bd0dd03aaf6317e77c11..317b1871f48db1da4abd315c3e67edb910af6b57:/test/controllers/api/relations_controller_test.rb?ds=inline
diff --git a/test/controllers/api/relations_controller_test.rb b/test/controllers/api/relations_controller_test.rb
index de24c087d..eb8f8e022 100644
--- a/test/controllers/api/relations_controller_test.rb
+++ b/test/controllers/api/relations_controller_test.rb
@@ -245,7 +245,7 @@ module Api
# create an relation with a node as member, this time test that we don't
# need a role attribute to be included
xml = "" \
- "" + ""
+ ""
put relation_create_path, :params => xml, :headers => auth_header
# hope for forbidden due to user
assert_response :forbidden,
@@ -322,7 +322,7 @@ module Api
# create an relation with a node as member, this time test that we don't
# need a role attribute to be included
xml = "" \
- "" + ""
+ ""
put relation_create_path, :params => xml, :headers => auth_header
# hope for success
assert_response :success,
@@ -1009,7 +1009,7 @@ module Api
##
# updates the relation (XML) +rel+ and
# yields the new version of that relation into the block.
- # the parsed XML doc is retured.
+ # the parsed XML doc is returned.
def with_update(rel, headers)
rel_id = rel.find("//osm/relation").first["id"].to_i
put api_relation_path(:id => rel_id), :params => rel.to_s, :headers => headers
@@ -1029,14 +1029,14 @@ module Api
##
# updates the relation (XML) +rel+ via the diff-upload API and
# yields the new version of that relation into the block.
- # the parsed XML doc is retured.
+ # the parsed XML doc is returned.
def with_update_diff(rel, headers)
rel_id = rel.find("//osm/relation").first["id"].to_i
cs_id = rel.find("//osm/relation").first["changeset"].to_i
version = nil
with_controller(Api::ChangesetsController.new) do
- doc = OSM::API.new.get_xml_doc
+ doc = OSM::API.new.xml_doc
change = XML::Node.new "osmChange"
doc.root = change
modify = XML::Node.new "modify"