X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/497009ed2b98dfdeeb349e891c1fbd88d14ff087..c9893e186b32bfd8e8ee8f00e78258387f4aac9c:/test/controllers/relation_controller_test.rb diff --git a/test/controllers/relation_controller_test.rb b/test/controllers/relation_controller_test.rb index d7a9bf536..bb9286f1d 100644 --- a/test/controllers/relation_controller_test.rb +++ b/test/controllers/relation_controller_test.rb @@ -1,5 +1,5 @@ -require 'test_helper' -require 'relation_controller' +require "test_helper" +require "relation_controller" class RelationControllerTest < ActionController::TestCase api_fixtures @@ -68,21 +68,21 @@ class RelationControllerTest < ActionController::TestCase # check that all relations containing a particular node, and no extra # relations, are returned from the relations_for_node call. def test_relations_for_node - check_relations_for_element(:relations_for_node, "node", + check_relations_for_element(:relations_for_node, "node", current_nodes(:node_used_by_relationship).id, - [ :visible_relation, :used_relation ]) + [:visible_relation, :used_relation]) end def test_relations_for_way check_relations_for_element(:relations_for_way, "way", current_ways(:used_way).id, - [ :visible_relation ]) + [:visible_relation]) end def test_relations_for_relation check_relations_for_element(:relations_for_relation, "relation", current_relations(:used_relation).id, - [ :visible_relation ]) + [:visible_relation]) end def check_relations_for_element(method, type, id, expected_relations) @@ -105,12 +105,15 @@ class RelationControllerTest < ActionController::TestCase def test_full # check the "full" mode + get :full, :id => 999999 + assert_response :not_found + + get :full, :id => current_relations(:invisible_relation).id + assert_response :gone + get :full, :id => current_relations(:visible_relation).id assert_response :success - # FIXME check whether this contains the stuff we want! - if $VERBOSE - print @response.body - end + # FIXME: check whether this contains the stuff we want! end ## @@ -146,7 +149,7 @@ class RelationControllerTest < ActionController::TestCase def test_create basic_authorization users(:normal_user).email, "test" - + # put the relation in a dummy fixture changset changeset_id = changesets(:normal_user_first_change).id @@ -154,8 +157,8 @@ class RelationControllerTest < ActionController::TestCase content "" put :create # hope for forbidden, due to user - assert_response :forbidden, - "relation upload should have failed with forbidden" + assert_response :forbidden, + "relation upload should have failed with forbidden" ### # create an relation with a node as member @@ -166,20 +169,19 @@ class RelationControllerTest < ActionController::TestCase "" put :create # hope for forbidden due to user - assert_response :forbidden, - "relation upload did not return forbidden status" - + assert_response :forbidden, + "relation upload did not return forbidden status" + ### - # create an relation with a node as member, this time test that we don't + # create an relation with a node as member, this time test that we don't # need a role attribute to be included nid = current_nodes(:used_node_1).id content "" + - ""+ - "" + "" + "" put :create # hope for forbidden due to user - assert_response :forbidden, - "relation upload did not return forbidden status" + assert_response :forbidden, + "relation upload did not return forbidden status" ### # create an relation with a way and a node as members @@ -191,14 +193,12 @@ class RelationControllerTest < ActionController::TestCase "" put :create # hope for forbidden, due to user - assert_response :forbidden, - "relation upload did not return success status" - - + assert_response :forbidden, + "relation upload did not return success status" ## Now try with the public user basic_authorization users(:public_user).email, "test" - + # put the relation in a dummy fixture changset changeset_id = changesets(:public_user_first_change).id @@ -206,29 +206,28 @@ class RelationControllerTest < ActionController::TestCase content "" put :create # hope for success - assert_response :success, - "relation upload did not return success status" + assert_response :success, + "relation upload did not return success status" # read id of created relation and search for it relationid = @response.body checkrelation = Relation.find(relationid) - assert_not_nil checkrelation, - "uploaded relation not found in data base after upload" + assert_not_nil checkrelation, + "uploaded relation not found in data base after upload" # compare values - assert_equal checkrelation.members.length, 0, - "saved relation contains members but should not" - assert_equal checkrelation.tags.length, 1, - "saved relation does not contain exactly one tag" + assert_equal checkrelation.members.length, 0, + "saved relation contains members but should not" + assert_equal checkrelation.tags.length, 1, + "saved relation does not contain exactly one tag" assert_equal changeset_id, checkrelation.changeset.id, - "saved relation does not belong in the changeset it was assigned to" - assert_equal users(:public_user).id, checkrelation.changeset.user_id, - "saved relation does not belong to user that created it" - assert_equal true, checkrelation.visible, - "saved relation is not visible" + "saved relation does not belong in the changeset it was assigned to" + assert_equal users(:public_user).id, checkrelation.changeset.user_id, + "saved relation does not belong to user that created it" + assert_equal true, checkrelation.visible, + "saved relation is not visible" # ok the relation is there but can we also retrieve it? get :read, :id => relationid assert_response :success - ### # create an relation with a node as member # This time try with a role attribute in the relation @@ -238,59 +237,57 @@ class RelationControllerTest < ActionController::TestCase "" put :create # hope for success - assert_response :success, - "relation upload did not return success status" + assert_response :success, + "relation upload did not return success status" # read id of created relation and search for it relationid = @response.body checkrelation = Relation.find(relationid) - assert_not_nil checkrelation, - "uploaded relation not found in data base after upload" + assert_not_nil checkrelation, + "uploaded relation not found in data base after upload" # compare values - assert_equal checkrelation.members.length, 1, - "saved relation does not contain exactly one member" - assert_equal checkrelation.tags.length, 1, - "saved relation does not contain exactly one tag" + assert_equal checkrelation.members.length, 1, + "saved relation does not contain exactly one member" + assert_equal checkrelation.tags.length, 1, + "saved relation does not contain exactly one tag" assert_equal changeset_id, checkrelation.changeset.id, - "saved relation does not belong in the changeset it was assigned to" - assert_equal users(:public_user).id, checkrelation.changeset.user_id, - "saved relation does not belong to user that created it" - assert_equal true, checkrelation.visible, - "saved relation is not visible" + "saved relation does not belong in the changeset it was assigned to" + assert_equal users(:public_user).id, checkrelation.changeset.user_id, + "saved relation does not belong to user that created it" + assert_equal true, checkrelation.visible, + "saved relation is not visible" # ok the relation is there but can we also retrieve it? - + get :read, :id => relationid assert_response :success - - + ### - # create an relation with a node as member, this time test that we don't + # create an relation with a node as member, this time test that we don't # need a role attribute to be included nid = current_nodes(:used_node_1).id content "" + - ""+ - "" + "" + "" put :create # hope for success - assert_response :success, - "relation upload did not return success status" + assert_response :success, + "relation upload did not return success status" # read id of created relation and search for it relationid = @response.body checkrelation = Relation.find(relationid) - assert_not_nil checkrelation, - "uploaded relation not found in data base after upload" + assert_not_nil checkrelation, + "uploaded relation not found in data base after upload" # compare values - assert_equal checkrelation.members.length, 1, - "saved relation does not contain exactly one member" - assert_equal checkrelation.tags.length, 1, - "saved relation does not contain exactly one tag" + assert_equal checkrelation.members.length, 1, + "saved relation does not contain exactly one member" + assert_equal checkrelation.tags.length, 1, + "saved relation does not contain exactly one tag" assert_equal changeset_id, checkrelation.changeset.id, - "saved relation does not belong in the changeset it was assigned to" - assert_equal users(:public_user).id, checkrelation.changeset.user_id, - "saved relation does not belong to user that created it" - assert_equal true, checkrelation.visible, - "saved relation is not visible" + "saved relation does not belong in the changeset it was assigned to" + assert_equal users(:public_user).id, checkrelation.changeset.user_id, + "saved relation does not belong to user that created it" + assert_equal true, checkrelation.visible, + "saved relation is not visible" # ok the relation is there but can we also retrieve it? - + get :read, :id => relationid assert_response :success @@ -304,28 +301,27 @@ class RelationControllerTest < ActionController::TestCase "" put :create # hope for success - assert_response :success, - "relation upload did not return success status" + assert_response :success, + "relation upload did not return success status" # read id of created relation and search for it relationid = @response.body checkrelation = Relation.find(relationid) - assert_not_nil checkrelation, - "uploaded relation not found in data base after upload" + assert_not_nil checkrelation, + "uploaded relation not found in data base after upload" # compare values - assert_equal checkrelation.members.length, 2, - "saved relation does not have exactly two members" - assert_equal checkrelation.tags.length, 1, - "saved relation does not contain exactly one tag" + assert_equal checkrelation.members.length, 2, + "saved relation does not have exactly two members" + assert_equal checkrelation.tags.length, 1, + "saved relation does not contain exactly one tag" assert_equal changeset_id, checkrelation.changeset.id, - "saved relation does not belong in the changeset it was assigned to" - assert_equal users(:public_user).id, checkrelation.changeset.user_id, - "saved relation does not belong to user that created it" - assert_equal true, checkrelation.visible, - "saved relation is not visible" + "saved relation does not belong in the changeset it was assigned to" + assert_equal users(:public_user).id, checkrelation.changeset.user_id, + "saved relation does not belong to user that created it" + assert_equal true, checkrelation.visible, + "saved relation is not visible" # ok the relation is there but can we also retrieve it? get :read, :id => relationid assert_response :success - end # ------------------------------------ @@ -334,7 +330,7 @@ class RelationControllerTest < ActionController::TestCase ## # test that, when tags are updated on a relation, the correct things - # happen to the correct tables and the API gives sensible results. + # happen to the correct tables and the API gives sensible results. # this is to test a case that gregory marler noticed and posted to # josm-dev. ## FIXME Move this to an integration test @@ -346,7 +342,7 @@ class RelationControllerTest < ActionController::TestCase with_relation(rel_id) do |rel| # alter one of the tags tag = rel.find("//osm/relation/tag").first - tag['v'] = 'some changed value' + tag["v"] = "some changed value" update_changeset(rel, cs_id) # check that the downloaded tags are the same as the uploaded tags... @@ -364,8 +360,8 @@ class RelationControllerTest < ActionController::TestCase ## # test that, when tags are updated on a relation when using the diff - # upload function, the correct things happen to the correct tables - # and the API gives sensible results. this is to test a case that + # upload function, the correct things happen to the correct tables + # and the API gives sensible results. this is to test a case that # gregory marler noticed and posted to josm-dev. def test_update_relation_tags_via_upload basic_authorization users(:public_user).email, "test" @@ -375,7 +371,7 @@ class RelationControllerTest < ActionController::TestCase with_relation(rel_id) do |rel| # alter one of the tags tag = rel.find("//osm/relation/tag").first - tag['v'] = 'some changed value' + tag["v"] = "some changed value" update_changeset(rel, cs_id) # check that the downloaded tags are the same as the uploaded tags... @@ -391,6 +387,19 @@ class RelationControllerTest < ActionController::TestCase end end + def test_update_wrong_id + basic_authorization users(:public_user).email, "test" + rel_id = current_relations(:multi_tag_relation).id + cs_id = changesets(:public_user_first_change).id + + with_relation(rel_id) do |rel| + update_changeset(rel, cs_id) + content rel + put :update, :id => current_relations(:visible_relation).id + assert_response :bad_request + end + end + # ------------------------------------- # Test creating some invalid relations. # ------------------------------------- @@ -407,8 +416,8 @@ class RelationControllerTest < ActionController::TestCase "" put :create # expect failure - assert_response :precondition_failed, - "relation upload with invalid node did not return 'precondition failed'" + assert_response :precondition_failed, + "relation upload with invalid node did not return 'precondition failed'" assert_equal "Precondition failed: Relation with id cannot be saved due to Node with id 0", @response.body end @@ -417,35 +426,33 @@ class RelationControllerTest < ActionController::TestCase # ------------------------------------- def test_create_invalid_xml basic_authorization users(:public_user).email, "test" - + # put the relation in a dummy fixture changeset that works changeset_id = changesets(:public_user_first_change).id - + # create some xml that should return an error content "" + - "" + - "" + "" + + "" put :create # expect failure assert_response :bad_request assert_match(/Cannot parse valid relation from xml string/, @response.body) assert_match(/The type is not allowed only, /, @response.body) end - - + # ------------------------------------- # Test deleting relations. # ------------------------------------- - + def test_delete ## First try to delete relation without auth delete :delete, :id => current_relations(:visible_relation).id assert_response :unauthorized - - + ## Then try with the private user, to make sure that you get a forbidden basic_authorization(users(:normal_user).email, "test") - + # this shouldn't work, as we should need the payload... delete :delete, :id => current_relations(:visible_relation).id assert_response :forbidden @@ -462,7 +469,7 @@ class RelationControllerTest < ActionController::TestCase assert_response :forbidden # try to delete with an invalid (non-existent) changeset - content update_changeset(current_relations(:visible_relation).to_xml,0) + content update_changeset(current_relations(:visible_relation).to_xml, 0) delete :delete, :id => current_relations(:visible_relation).id assert_response :forbidden @@ -481,7 +488,7 @@ class RelationControllerTest < ActionController::TestCase delete :delete, :id => current_relations(:invisible_relation).id assert_response :forbidden - # this works now because the relation which was using this one + # this works now because the relation which was using this one # has been deleted. content(relations(:used_relation).to_xml) delete :delete, :id => current_relations(:used_relation).id @@ -491,10 +498,8 @@ class RelationControllerTest < ActionController::TestCase delete :delete, :id => 0 assert_response :forbidden - - ## now set auth for the public user - basic_authorization(users(:public_user).email, "test"); + basic_authorization(users(:public_user).email, "test") # this shouldn't work, as we should need the payload... delete :delete, :id => current_relations(:visible_relation).id @@ -513,27 +518,27 @@ class RelationControllerTest < ActionController::TestCase assert_response :conflict # try to delete with an invalid (non-existent) changeset - content update_changeset(current_relations(:visible_relation).to_xml,0) + content update_changeset(current_relations(:visible_relation).to_xml, 0) delete :delete, :id => current_relations(:visible_relation).id assert_response :conflict # this won't work because the relation is in a changeset owned by someone else content(relations(:used_relation).to_xml) delete :delete, :id => current_relations(:used_relation).id - assert_response :conflict, - "shouldn't be able to delete a relation in a changeset owned by someone else (#{@response.body})" + assert_response :conflict, + "shouldn't be able to delete a relation in a changeset owned by someone else (#{@response.body})" # this won't work because the relation in the payload is different to that passed content(relations(:public_used_relation).to_xml) delete :delete, :id => current_relations(:used_relation).id assert_not_equal relations(:public_used_relation).id, current_relations(:used_relation).id assert_response :bad_request, "shouldn't be able to delete a relation when payload is different to the url" - + # this won't work because the relation is in-use by another relation content(relations(:public_used_relation).to_xml) delete :delete, :id => current_relations(:public_used_relation).id - assert_response :precondition_failed, - "shouldn't be able to delete a relation used in a relation (#{@response.body})" + assert_response :precondition_failed, + "shouldn't be able to delete a relation used in a relation (#{@response.body})" assert_equal "Precondition failed: The relation 5 is used in relation 6.", @response.body # this should work when we provide the appropriate payload... @@ -544,24 +549,24 @@ class RelationControllerTest < ActionController::TestCase # valid delete should return the new version number, which should # be greater than the old version number assert @response.body.to_i > current_relations(:visible_relation).version, - "delete request should return a new version number for relation" + "delete request should return a new version number for relation" # this won't work since the relation is already deleted content(relations(:invisible_relation).to_xml) delete :delete, :id => current_relations(:invisible_relation).id assert_response :gone - + # Public visible relation needs to be deleted content(relations(:public_visible_relation).to_xml) delete :delete, :id => current_relations(:public_visible_relation).id assert_response :success - # this works now because the relation which was using this one + # this works now because the relation which was using this one # has been deleted. content(relations(:public_used_relation).to_xml) delete :delete, :id => current_relations(:public_used_relation).id - assert_response :success, - "should be able to delete a relation used in an old relation (#{@response.body})" + assert_response :success, + "should be able to delete a relation used in an old relation (#{@response.body})" # this won't work since the relation never existed delete :delete, :id => 0 @@ -574,18 +579,18 @@ class RelationControllerTest < ActionController::TestCase def test_tag_modify_bounding_box # in current fixtures, relation 5 contains nodes 3 and 5 (node 3 # indirectly via way 3), so the bbox should be [3,3,5,5]. - check_changeset_modify(BoundingBox.new(3,3,5,5)) do |changeset_id| + check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id| # add a tag to an existing relation relation_xml = current_relations(:visible_relation).to_xml relation_element = relation_xml.find("//osm/relation").first new_tag = XML::Node.new("tag") - new_tag['k'] = "some_new_tag" - new_tag['v'] = "some_new_value" + new_tag["k"] = "some_new_tag" + new_tag["v"] = "some_new_value" relation_element << new_tag - + # update changeset ID to point to new changeset update_changeset(relation_xml, changeset_id) - + # upload the change content relation_xml put :update, :id => current_relations(:visible_relation).id @@ -603,59 +608,59 @@ class RelationControllerTest < ActionController::TestCase current_nodes(:used_node_2), current_ways(:used_way), current_ways(:way_with_versions) - ].each_with_index do |element, version| + ].each_with_index do |element, _version| bbox = element.bbox.to_unscaled check_changeset_modify(bbox) do |changeset_id| relation_xml = Relation.find(relation_id).to_xml relation_element = relation_xml.find("//osm/relation").first new_member = XML::Node.new("member") - new_member['ref'] = element.id.to_s - new_member['type'] = element.class.to_s.downcase - new_member['role'] = "some_role" + new_member["ref"] = element.id.to_s + new_member["type"] = element.class.to_s.downcase + new_member["role"] = "some_role" relation_element << new_member - + # update changeset ID to point to new changeset update_changeset(relation_xml, changeset_id) - + # upload the change content relation_xml put :update, :id => current_relations(:visible_relation).id assert_response :success, "can't update relation for add #{element.class}/bbox test: #{@response.body}" - # get it back and check the ordering + # get it back and check the ordering get :read, :id => relation_id assert_response :success, "can't read back the relation: #{@response.body}" check_ordering(relation_xml, @response.body) end end end - + ## - # remove a member from a relation and check the bounding box is + # remove a member from a relation and check the bounding box is # only that element. def test_remove_member_bounding_box - check_changeset_modify(BoundingBox.new(5,5,5,5)) do |changeset_id| + check_changeset_modify(BoundingBox.new(5, 5, 5, 5)) do |changeset_id| # remove node 5 (5,5) from an existing relation relation_xml = current_relations(:visible_relation).to_xml - relation_xml. - find("//osm/relation/member[@type='node'][@ref='5']"). - first.remove! - + relation_xml + .find("//osm/relation/member[@type='node'][@ref='5']") + .first.remove! + # update changeset ID to point to new changeset update_changeset(relation_xml, changeset_id) - + # upload the change content relation_xml put :update, :id => current_relations(:visible_relation).id assert_response :success, "can't update relation for remove node/bbox test" end end - + ## # check that relations are ordered def test_relation_member_ordering basic_authorization(users(:public_user).email, "test") - + doc_str = < @@ -680,19 +685,19 @@ OSM # insert a member at the front new_member = XML::Node.new "member" - new_member['ref'] = 5.to_s - new_member['type'] = 'node' - new_member['role'] = 'new first' + new_member["ref"] = 5.to_s + new_member["type"] = "node" + new_member["role"] = "new first" doc.find("//osm/relation").first.child.prev = new_member # update the version, should be 1? - doc.find("//osm/relation").first['id'] = relation_id.to_s - doc.find("//osm/relation").first['version'] = 1.to_s + doc.find("//osm/relation").first["id"] = relation_id.to_s + doc.find("//osm/relation").first["version"] = 1.to_s # upload the next version of the relation content doc put :update, :id => relation_id assert_response :success, "can't update relation: #{@response.body}" - new_version = @response.body.to_i + assert_equal 2, @response.body.to_i # get it back again and check the ordering again get :read, :id => relation_id @@ -707,7 +712,7 @@ OSM end end - ## + ## # check that relations can contain duplicate members def test_relation_member_duplicates doc_str = < OSM doc = XML::Parser.string(doc_str).parse - basic_authorization(users(:public_user).email, "test"); + basic_authorization(users(:public_user).email, "test") content doc put :create @@ -780,28 +785,28 @@ OSM ## # remove all the members from a relation. the result is pretty useless, but # still technically valid. - def test_remove_all_members - check_changeset_modify(BoundingBox.new(3,3,5,5)) do |changeset_id| + def test_remove_all_members + check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id| relation_xml = current_relations(:visible_relation).to_xml - relation_xml. - find("//osm/relation/member"). - each {|m| m.remove!} - + relation_xml + .find("//osm/relation/member") + .each(&:remove!) + # update changeset ID to point to new changeset update_changeset(relation_xml, changeset_id) - + # upload the change content relation_xml put :update, :id => current_relations(:visible_relation).id assert_response :success, "can't update relation for remove all members test" checkrelation = Relation.find(current_relations(:visible_relation).id) - assert_not_nil(checkrelation, + assert_not_nil(checkrelation, "uploaded relation not found in database after upload") assert_equal(0, checkrelation.members.length, "relation contains members but they should have all been deleted") end end - + # ============================================================ # utility functions # ============================================================ @@ -813,11 +818,11 @@ OSM new_doc = XML::Parser.string(xml).parse doc_members = doc.find("//osm/relation/member").collect do |m| - [m['ref'].to_i, m['type'].to_sym, m['role']] + [m["ref"].to_i, m["type"].to_sym, m["role"]] end new_members = new_doc.find("//osm/relation/member").collect do |m| - [m['ref'].to_i, m['type'].to_sym, m['role']] + [m["ref"].to_i, m["type"].to_sym, m["role"]] end doc_members.zip(new_members).each do |d, n| @@ -830,7 +835,7 @@ OSM # that the changeset bounding box is +bbox+. def check_changeset_modify(bbox) ## First test with the private user to check that you get a forbidden - basic_authorization(users(:normal_user).email, "test"); + basic_authorization(users(:normal_user).email, "test") # create a new changeset for this operation, so we are assured # that the bounding box will be newly-generated. @@ -840,10 +845,9 @@ OSM assert_response :forbidden, "shouldn't be able to create changeset for modify test, as should get forbidden" end - ## Now do the whole thing with the public user basic_authorization(users(:public_user).email, "test") - + # create a new changeset for this operation, so we are assured # that the bounding box will be newly-generated. changeset_id = with_controller(ChangesetController.new) do @@ -886,8 +890,8 @@ OSM end ## - # updates the relation (XML) +rel+ and - # yields the new version of that relation into the block. + # updates the relation (XML) +rel+ and + # yields the new version of that relation into the block. # the parsed XML doc is retured. def with_update(rel) rel_id = rel.find("//osm/relation").first["id"].to_i @@ -903,23 +907,23 @@ OSM yield new_rel - return version + version end ## # updates the relation (XML) +rel+ via the diff-upload API and - # yields the new version of that relation into the block. + # yields the new version of that relation into the block. # the parsed XML doc is retured. def with_update_diff(rel) rel_id = rel.find("//osm/relation").first["id"].to_i - cs_id = rel.find("//osm/relation").first['changeset'].to_i + cs_id = rel.find("//osm/relation").first["changeset"].to_i version = nil with_controller(ChangesetController.new) do doc = OSM::API.new.get_xml_doc - change = XML::Node.new 'osmChange' + change = XML::Node.new "osmChange" doc.root = change - modify = XML::Node.new 'modify' + modify = XML::Node.new "modify" change << modify modify << doc.import(rel.find("//osm/relation").first) @@ -927,29 +931,28 @@ OSM post :upload, :id => cs_id assert_response :success, "can't upload diff relation: #{@response.body}" version = xml_parse(@response.body).find("//diffResult/relation").first["new_version"].to_i - end - + end + # now get the new version get :read, :id => rel_id assert_response :success new_rel = xml_parse(@response.body) - + yield new_rel - - return version + + version end ## # returns a k->v hash of tags from an xml doc - def get_tags_as_hash(a) - a.find("//osm/relation/tag").sort_by { |v| v['k'] }.inject({}) do |h,v| - h[v['k']] = v['v'] - h + def get_tags_as_hash(a) + a.find("//osm/relation/tag").sort_by { |v| v["k"] }.each_with_object({}) do |v, h| + h[v["k"]] = v["v"] end end - + ## - # assert that all tags on relation documents +a+ and +b+ + # assert that all tags on relation documents +a+ and +b+ # are equal def assert_tags_equal(a, b) # turn the XML doc into tags hashes @@ -958,23 +961,23 @@ OSM assert_equal a_tags.keys, b_tags.keys, "Tag keys should be identical." a_tags.each do |k, v| - assert_equal v, b_tags[k], - "Tags which were not altered should be the same. " + - "#{a_tags.inspect} != #{b_tags.inspect}" + assert_equal v, b_tags[k], + "Tags which were not altered should be the same. " + + "#{a_tags.inspect} != #{b_tags.inspect}" end end ## # update the changeset_id of a node element def update_changeset(xml, changeset_id) - xml_attr_rewrite(xml, 'changeset', changeset_id) + xml_attr_rewrite(xml, "changeset", changeset_id) end ## # update an attribute in the node element def xml_attr_rewrite(xml, name, value) xml.find("//osm/relation").first[name] = value.to_s - return xml + xml end ##