X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/90918ade9200275cb4382c2b1b3c253914fb8b0e..e9324ad6818cfec0578a8fa4dac0b2724a1445f1:/test/controllers/changeset_controller_test.rb diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb index cd4de2874..9bf3a4b8e 100644 --- a/test/controllers/changeset_controller_test.rb +++ b/test/controllers/changeset_controller_test.rb @@ -2,8 +2,6 @@ require "test_helper" require "changeset_controller" class ChangesetControllerTest < ActionController::TestCase - api_fixtures - ## # test all routes which lead to this controller def test_routes @@ -180,14 +178,14 @@ class ChangesetControllerTest < ActionController::TestCase def test_read changeset_id = create(:changeset).id - get :read, :id => changeset_id + get :read, :params => { :id => changeset_id } assert_response :success, "cannot get first changeset" assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1 assert_select "osm>changeset[id='#{changeset_id}']", 1 assert_select "osm>changeset>discussion", 0 - get :read, :id => changeset_id, :include_discussion => true + get :read, :params => { :id => changeset_id, :include_discussion => true } assert_response :success, "cannot get first changeset with comments" assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1 @@ -198,7 +196,7 @@ class ChangesetControllerTest < ActionController::TestCase changeset_id = create(:changeset, :closed).id create_list(:changeset_comment, 3, :changeset_id => changeset_id) - get :read, :id => changeset_id, :include_discussion => true + get :read, :params => { :id => changeset_id, :include_discussion => true } assert_response :success, "cannot get closed changeset with comments" assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1 @@ -212,7 +210,7 @@ class ChangesetControllerTest < ActionController::TestCase def test_read_not_found [0, -32, 233455644, "afg", "213"].each do |id| begin - get :read, :id => id + get :read, :params => { :id => id } assert_response :not_found, "should get a not found" rescue ActionController::UrlGenerationError => ex assert_match /No route matches/, ex.to_s @@ -229,19 +227,19 @@ class ChangesetControllerTest < ActionController::TestCase changeset = create(:changeset, :user => user) ## Try without authentication - put :close, :id => changeset.id + put :close, :params => { :id => changeset.id } assert_response :unauthorized ## Try using the non-public user basic_authorization private_user.email, "test" - put :close, :id => private_changeset.id + put :close, :params => { :id => private_changeset.id } assert_require_public_data ## The try with the public user basic_authorization user.email, "test" cs_id = changeset.id - put :close, :id => cs_id + put :close, :params => { :id => cs_id } assert_response :success # test that it really is closed now @@ -258,7 +256,7 @@ class ChangesetControllerTest < ActionController::TestCase basic_authorization user.email, "test" - put :close, :id => changeset.id + put :close, :params => { :id => changeset.id } assert_response :conflict assert_equal "The user doesn't own that changeset", @response.body end @@ -271,10 +269,10 @@ class ChangesetControllerTest < ActionController::TestCase basic_authorization user.email, "test" - get :close, :id => changeset.id + get :close, :params => { :id => changeset.id } assert_response :method_not_allowed - post :close, :id => changeset.id + post :close, :params => { :id => changeset.id } assert_response :method_not_allowed end @@ -286,7 +284,7 @@ class ChangesetControllerTest < ActionController::TestCase # First try to do it with no auth cs_ids.each do |id| begin - put :close, :id => id + put :close, :params => { :id => id } assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized" rescue ActionController::UrlGenerationError => ex assert_match /No route matches/, ex.to_s @@ -297,7 +295,7 @@ class ChangesetControllerTest < ActionController::TestCase basic_authorization create(:user).email, "test" cs_ids.each do |id| begin - put :close, :id => id + put :close, :params => { :id => id } assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed" rescue ActionController::UrlGenerationError => ex assert_match /No route matches/, ex.to_s @@ -329,27 +327,27 @@ class ChangesetControllerTest < ActionController::TestCase # simple diff to change a node, way and relation by removing # their tags - diff = < - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :unauthorized, "shouldn't be able to upload a simple valid diff to changeset: #{@response.body}" @@ -359,27 +357,27 @@ EOF # simple diff to change a node, way and relation by removing # their tags - diff = < - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :forbidden, "can't upload a simple valid diff to changeset: #{@response.body}" @@ -389,27 +387,27 @@ EOF # simple diff to change a node, way and relation by removing # their tags - diff = < - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :success, "can't upload a simple valid diff to changeset: #{@response.body}" @@ -424,34 +422,37 @@ EOF def test_upload_create_valid user = create(:user) changeset = create(:changeset, :user => user) + node = create(:node) + way = create(:way_with_nodes, :nodes_count => 2) + relation = create(:relation) basic_authorization user.email, "test" # simple diff to create a node way and relation using placeholders - diff = < - - - - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset.id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't upload a simple valid creation to changeset: #{@response.body}" @@ -487,28 +488,36 @@ EOF # test a complex delete where we delete elements which rely on eachother # in the same transaction. def test_upload_delete - basic_authorization changesets(:public_user_first_change).user.display_name, "test" + changeset = create(:changeset) + super_relation = create(:relation) + used_relation = create(:relation) + used_way = create(:way) + used_node = create(:node) + create(:relation_member, :relation => super_relation, :member => used_relation) + create(:relation_member, :relation => super_relation, :member => used_way) + create(:relation_member, :relation => super_relation, :member => used_node) + + basic_authorization changeset.user.display_name, "test" diff = XML::Document.new diff.root = XML::Node.new "osmChange" delete = XML::Node.new "delete" diff.root << delete - delete << current_relations(:visible_relation).to_xml_node - delete << current_relations(:used_relation).to_xml_node - delete << current_ways(:used_way).to_xml_node - delete << current_nodes(:node_used_by_relationship).to_xml_node + delete << super_relation.to_xml_node + delete << used_relation.to_xml_node + delete << used_way.to_xml_node + delete << used_node.to_xml_node # update the changeset to one that this user owns - changeset_id = changesets(:public_user_first_change).id - %w(node way relation).each do |type| + %w[node way relation].each do |type| delete.find("//osmChange/delete/#{type}").each do |n| - n["changeset"] = changeset_id.to_s + n["changeset"] = changeset.id.to_s end end # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't upload a deletion diff to changeset: #{@response.body}" @@ -518,25 +527,25 @@ EOF assert_select "diffResult>relation", 2 # check that everything was deleted - assert_equal false, Node.find(current_nodes(:node_used_by_relationship).id).visible - assert_equal false, Way.find(current_ways(:used_way).id).visible - assert_equal false, Relation.find(current_relations(:visible_relation).id).visible - assert_equal false, Relation.find(current_relations(:used_relation).id).visible + assert_equal false, Node.find(used_node.id).visible + assert_equal false, Way.find(used_way.id).visible + assert_equal false, Relation.find(super_relation.id).visible + assert_equal false, Relation.find(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 changesets(:public_user_first_change).user.display_name, "test" + node = create(:node) + changeset = create(:changeset) - node = current_nodes(:public_visible_node) - cs = changesets(:public_user_first_change) - diff = "" + basic_authorization changeset.user.display_name, "test" + diff = "" # upload it content diff - post :upload, :id => cs.id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't upload a deletion diff to changeset: #{@response.body}" @@ -573,35 +582,35 @@ EOF # upload some widely-spaced nodes, spiralling positive and negative to cause # largest bbox over-expansion possible. - diff = < - - - - - - - - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + + + + + + + + EOF # upload it, which used to cause an error like "PGError: ERROR: # integer out of range" (bug #2152). but shouldn't any more. content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :success, "can't upload a spatially-large diff to changeset: #{@response.body}" @@ -617,48 +626,78 @@ EOF # test that deleting stuff in a transaction doesn't bypass the checks # to ensure that used elements are not deleted. def test_upload_delete_invalid - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs = changesets(:public_user_first_change) + changeset = create(:changeset) + relation = create(:relation) + other_relation = create(:relation) + used_way = create(:way) + used_node = create(:node) + create(:relation_member, :relation => relation, :member => used_way) + create(:relation_member, :relation => relation, :member => used_node) + + basic_authorization changeset.user.email, "test" diff = XML::Document.new diff.root = XML::Node.new "osmChange" delete = XML::Node.new "delete" diff.root << delete - delete << current_relations(:public_visible_relation).to_xml_node - delete << current_ways(:used_way).to_xml_node - delete << current_nodes(:node_used_by_relationship).to_xml_node + delete << other_relation.to_xml_node + delete << used_way.to_xml_node + delete << used_node.to_xml_node + + # update the changeset to one that this user owns + %w[node way relation].each do |type| + delete.find("//osmChange/delete/#{type}").each do |n| + n["changeset"] = changeset.id.to_s + end + end # upload it content diff - post :upload, :id => cs.id + post :upload, :params => { :id => changeset.id } assert_response :precondition_failed, "shouldn't be able to upload a invalid deletion diff: #{@response.body}" - assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body + assert_equal "Precondition failed: Way #{used_way.id} is still used by relations #{relation.id}.", @response.body # check that nothing was, in fact, deleted - assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible - assert_equal true, Way.find(current_ways(:used_way).id).visible - assert_equal true, Relation.find(current_relations(:visible_relation).id).visible + assert_equal true, Node.find(used_node.id).visible + assert_equal true, Way.find(used_way.id).visible + assert_equal true, Relation.find(relation.id).visible + assert_equal true, Relation.find(other_relation.id).visible end ## # test that a conditional delete of an in use object works. def test_upload_delete_if_unused - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs = changesets(:public_user_first_change) + changeset = create(:changeset) + super_relation = create(:relation) + used_relation = create(:relation) + used_way = create(:way) + used_node = create(:node) + create(:relation_member, :relation => super_relation, :member => used_relation) + create(:relation_member, :relation => super_relation, :member => used_way) + create(:relation_member, :relation => super_relation, :member => used_node) + + basic_authorization changeset.user.email, "test" diff = XML::Document.new diff.root = XML::Node.new "osmChange" delete = XML::Node.new "delete" diff.root << delete delete["if-unused"] = "" - 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 + delete << used_relation.to_xml_node + delete << used_way.to_xml_node + delete << used_node.to_xml_node + + # update the changeset to one that this user owns + %w[node way relation].each do |type| + delete.find("//osmChange/delete/#{type}").each do |n| + n["changeset"] = changeset.id.to_s + end + end # upload it content diff - post :upload, :id => cs.id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't do a conditional delete of in use objects: #{@response.body}" @@ -672,46 +711,47 @@ EOF doc = XML::Parser.string(@response.body).parse # check the old IDs are all present and what we expect - assert_equal current_nodes(:node_used_by_relationship).id, doc.find("//diffResult/node").first["old_id"].to_i - assert_equal current_ways(:used_way).id, doc.find("//diffResult/way").first["old_id"].to_i - assert_equal current_relations(:public_used_relation).id, doc.find("//diffResult/relation").first["old_id"].to_i + assert_equal used_node.id, doc.find("//diffResult/node").first["old_id"].to_i + assert_equal used_way.id, doc.find("//diffResult/way").first["old_id"].to_i + assert_equal used_relation.id, doc.find("//diffResult/relation").first["old_id"].to_i # check the new IDs are all present and unchanged - assert_equal current_nodes(:node_used_by_relationship).id, doc.find("//diffResult/node").first["new_id"].to_i - assert_equal current_ways(:used_way).id, doc.find("//diffResult/way").first["new_id"].to_i - assert_equal current_relations(:public_used_relation).id, doc.find("//diffResult/relation").first["new_id"].to_i + assert_equal used_node.id, doc.find("//diffResult/node").first["new_id"].to_i + assert_equal used_way.id, doc.find("//diffResult/way").first["new_id"].to_i + assert_equal used_relation.id, doc.find("//diffResult/relation").first["new_id"].to_i # check the new versions are all present and unchanged - assert_equal current_nodes(:node_used_by_relationship).version, doc.find("//diffResult/node").first["new_version"].to_i - assert_equal current_ways(:used_way).version, doc.find("//diffResult/way").first["new_version"].to_i - assert_equal current_relations(:public_used_relation).version, doc.find("//diffResult/relation").first["new_version"].to_i + assert_equal used_node.version, doc.find("//diffResult/node").first["new_version"].to_i + assert_equal used_way.version, doc.find("//diffResult/way").first["new_version"].to_i + assert_equal used_relation.version, doc.find("//diffResult/relation").first["new_version"].to_i # check that nothing was, in fact, deleted - assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible - assert_equal true, Way.find(current_ways(:used_way).id).visible - assert_equal true, Relation.find(current_relations(:public_used_relation).id).visible + assert_equal true, Node.find(used_node.id).visible + assert_equal true, Way.find(used_way.id).visible + assert_equal true, Relation.find(used_relation.id).visible end ## # upload an element with a really long tag value def test_upload_invalid_too_long_tag - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" # simple diff to create a node way and relation using placeholders - diff = < - - - - - - + diff = < + + + + + + EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :params => { :id => changeset.id } assert_response :bad_request, "shoudln't be able to upload too long a tag to changeset: #{@response.body}" end @@ -720,35 +760,41 @@ EOF # upload something which creates new objects and inserts them into # existing containers using placeholders. def test_upload_complex - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs_id = changesets(:public_user_first_change).id + way = create(:way) + node = create(:node) + relation = create(:relation) + create(:way_node, :way => way, :node => node) + + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" # simple diff to create a node way and relation using placeholders - diff = < - - - - - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't upload a complex diff to changeset: #{@response.body}" @@ -764,8 +810,8 @@ EOF # check that the changes made it into the database assert_equal 2, Node.find(new_node_id).tags.size, "new node should have two tags" - assert_equal [new_node_id, 3], Way.find(1).nds, "way nodes should match" - Relation.find(1).members.each do |type, id, _role| + assert_equal [new_node_id, node.id], Way.find(way.id).nds, "way nodes should match" + Relation.find(relation.id).members.each do |type, id, _role| if type == "node" assert_equal new_node_id, id, "relation should contain new node" end @@ -776,77 +822,80 @@ EOF # create a diff which references several changesets, which should cause # a rollback and none of the diff gets committed def test_upload_invalid_changesets - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + other_changeset = create(:changeset, :user => changeset.user) + node = create(:node) + way = create(:way) + relation = create(:relation) + other_relation = create(:relation) + + basic_authorization changeset.user.email, "test" # simple diff to create a node way and relation using placeholders - diff = < - - - - - - - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + + + + + + + EOF - # cache the objects before uploading them - node = current_nodes(:visible_node) - way = current_ways(:visible_way) - rel = current_relations(:visible_relation) # upload it content diff - post :upload, :id => cs_id + post :upload, :params => { :id => changeset.id } assert_response :conflict, - "uploading a diff with multiple changsets should have failed" + "uploading a diff with multiple changesets should have failed" # check that objects are unmodified - assert_nodes_are_equal(node, Node.find(1)) - assert_ways_are_equal(way, Way.find(1)) - assert_relations_are_equal(rel, Relation.find(1)) + assert_nodes_are_equal(node, Node.find(node.id)) + assert_ways_are_equal(way, Way.find(way.id)) + assert_relations_are_equal(relation, Relation.find(relation.id)) end ## # upload multiple versions of the same element in the same diff. def test_upload_multiple_valid - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs_id = changesets(:public_user_first_change).id + node = create(:node) + changeset = create(:changeset) + basic_authorization changeset.user.email, "test" # change the location of a node multiple times, each time referencing # the last version. doesn't this depend on version numbers being # sequential? - diff = < - - - - - - - - - - - + diff = < + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" @@ -860,21 +909,23 @@ EOF # upload multiple versions of the same element in the same diff, but # keep the version numbers the same. def test_upload_multiple_duplicate - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs_id = changesets(:public_user_first_change).id - - diff = < - - - - - + node = create(:node) + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :params => { :id => changeset.id } assert_response :conflict, "shouldn't be able to upload the same element twice in a diff: #{@response.body}" end @@ -882,20 +933,21 @@ EOF ## # try to upload some elements without specifying the version def test_upload_missing_version - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs_id = changesets(:public_user_first_change).id - - diff = < - - - - + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :params => { :id => changeset.id } assert_response :bad_request, "shouldn't be able to upload an element without version: #{@response.body}" end @@ -903,18 +955,19 @@ EOF ## # try to upload with commands other than create, modify, or delete def test_action_upload_invalid - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs_id = changesets(:public_user_first_change).id - - diff = < - - - - + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + EOF content diff - post :upload, :id => cs_id + post :upload, :params => { :id => changeset.id } assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping" assert_equal @response.body, "Unknown action ping, choices are create, modify, delete" end @@ -923,26 +976,32 @@ EOF # upload a valid changeset which has a mixture of whitespace # to check a bug reported by ivansanchez (#1565). def test_upload_whitespace_valid - basic_authorization changesets(:public_user_first_change).user.email, "test" - changeset_id = changesets(:public_user_first_change).id - - diff = < - - - - - - - + changeset = create(:changeset) + node = create(:node) + way = create(:way_with_nodes, :nodes_count => 2) + relation = create(:relation) + other_relation = create(:relation) + create(:relation_tag, :relation => relation) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't upload a valid diff with whitespace variations to changeset: #{@response.body}" @@ -951,36 +1010,36 @@ EOF assert_select "diffResult>relation", 1 # check that the changes made it into the database - assert_equal 1, Node.find(1).tags.size, "node 1 should now have one tag" - assert_equal 0, Relation.find(1).tags.size, "relation 1 should now have no tags" + assert_equal 1, Node.find(node.id).tags.size, "node #{node.id} should now have one tag" + assert_equal 0, Relation.find(relation.id).tags.size, "relation #{relation.id} should now have no tags" end ## - # upload a valid changeset which has a mixture of whitespace - # to check a bug reported by ivansanchez. + # test that a placeholder can be reused within the same upload. def test_upload_reuse_placeholder_valid - basic_authorization changesets(:public_user_first_change).user.email, "test" - changeset_id = changesets(:public_user_first_change).id - - diff = < - - - - - - - - - - - - + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}" @@ -993,22 +1052,23 @@ EOF # test what happens if a diff upload re-uses placeholder IDs in an # illegal way. def test_upload_placeholder_invalid - basic_authorization changesets(:public_user_first_change).user.email, "test" - changeset_id = changesets(:public_user_first_change).id - - diff = < - - - - - - + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset.id } assert_response :bad_request, "shouldn't be able to re-use placeholder IDs" end @@ -1017,110 +1077,114 @@ EOF # test that uploading a way referencing invalid placeholders gives a # proper error, not a 500. def test_upload_placeholder_invalid_way - basic_authorization changesets(:public_user_first_change).user.email, "test" - changeset_id = changesets(:public_user_first_change).id - - diff = < - - - - - - - - - - - - + changeset = create(:changeset) + way = create(:way) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset.id } assert_response :bad_request, "shouldn't be able to use invalid placeholder IDs" assert_equal "Placeholder node not found for reference -4 in way -1", @response.body # the same again, but this time use an existing way - diff = < - - - - - - - - - - - - + diff = < + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset.id } assert_response :bad_request, "shouldn't be able to use invalid placeholder IDs" - assert_equal "Placeholder node not found for reference -4 in way 1", @response.body + assert_equal "Placeholder node not found for reference -4 in way #{way.id}", @response.body end ## # test that uploading a relation referencing invalid placeholders gives a # proper error, not a 500. def test_upload_placeholder_invalid_relation - basic_authorization changesets(:public_user_first_change).user.email, "test" - changeset_id = changesets(:public_user_first_change).id - - diff = < - - - - - - - - - - - - + changeset = create(:changeset) + relation = create(:relation) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset.id } assert_response :bad_request, "shouldn't be able to use invalid placeholder IDs" assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body - # the same again, but this time use an existing way - diff = < - - - - - - - - - - - - + # the same again, but this time use an existing relation + diff = < + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset.id } assert_response :bad_request, "shouldn't be able to use invalid placeholder IDs" - assert_equal "Placeholder Way not found for reference -1 in relation 1.", @response.body + assert_equal "Placeholder Way not found for reference -1 in relation #{relation.id}.", @response.body end ## @@ -1136,7 +1200,7 @@ EOF assert_response :success changeset_id = @response.body.to_i - old_node = current_nodes(:visible_node) + old_node = create(:node, :lat => 1, :lon => 1) diff = XML::Document.new diff.root = XML::Node.new "osmChange" @@ -1150,7 +1214,7 @@ EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :success, "diff should have uploaded OK" @@ -1174,14 +1238,15 @@ EOF assert_response :success changeset_id = @response.body.to_i - old_way = current_ways(:visible_way) + old_way = create(:way) + create(:way_node, :way => old_way, :node => create(:node, :lat => 1, :lon => 1)) diff = XML::Document.new diff.root = XML::Node.new "osmChange" modify = XML::Node.new "modify" xml_old_way = old_way.to_xml_node nd_ref = XML::Node.new "nd" - nd_ref["ref"] = current_nodes(:visible_node).id.to_s + nd_ref["ref"] = create(:node, :lat => 3, :lon => 3).id.to_s xml_old_way << nd_ref xml_old_way["changeset"] = changeset_id.to_s modify << xml_old_way @@ -1189,7 +1254,7 @@ EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :success, "diff should have uploaded OK" @@ -1204,7 +1269,9 @@ EOF ## # test for more issues in #1568 def test_upload_empty_invalid - basic_authorization changesets(:public_user_first_change).user.email, "test" + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" ["", "", @@ -1212,7 +1279,7 @@ EOF ""].each do |diff| # upload it content diff - post :upload, :id => changesets(:public_user_first_change).id + post :upload, :params => { :id => changeset.id } assert_response(:success, "should be able to upload " + "empty changeset: " + diff) end @@ -1221,20 +1288,23 @@ EOF ## # test that the X-Error-Format header works to request XML errors def test_upload_xml_errors - basic_authorization changesets(:public_user_first_change).user.email, "test" - cs = changesets(:public_user_first_change) + changeset = create(:changeset) + node = create(:node) + create(:relation_member, :member => node) + + basic_authorization changeset.user.email, "test" # try and delete a node that is in use diff = XML::Document.new diff.root = XML::Node.new "osmChange" delete = XML::Node.new "delete" diff.root << delete - delete << current_nodes(:node_used_by_relationship).to_xml_node + delete << node.to_xml_node # upload it content diff error_format "xml" - post :upload, :id => cs.id + post :upload, :params => { :id => changeset.id } assert_response :success, "failed to return error in XML format" @@ -1248,8 +1318,10 @@ EOF # when we make some simple changes we get the same changes back from the # diff download. def test_diff_download_simple + node = create(:node) + ## First try with a non-public user, which should get a forbidden - basic_authorization(create(:user, :data_public => false).email, "test") + basic_authorization create(:user, :data_public => false).email, "test" # create a temporary changeset content "" + @@ -1259,7 +1331,7 @@ EOF assert_response :forbidden ## Now try with a normal user - basic_authorization(create(:user).email, "test") + basic_authorization create(:user).email, "test" # create a temporary changeset content "" + @@ -1270,28 +1342,28 @@ EOF changeset_id = @response.body.to_i # add a diff to it - diff = < - - - - - - - - - - - + diff = < + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - get :download, :id => changeset_id + get :download, :params => { :id => changeset_id } assert_response :success assert_select "osmChange", 1 @@ -1305,7 +1377,7 @@ EOF # # NOTE: the error turned out to be something else completely! def test_josm_upload - basic_authorization(create(:user).email, "test") + basic_authorization create(:user).email, "test" # create a temporary changeset content "" + @@ -1315,42 +1387,42 @@ EOF assert_response :success changeset_id = @response.body.to_i - diff = < - - - - - - - - - - - - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + + + + + + + + + + + + OSMFILE # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :success, "can't upload a diff from JOSM: #{@response.body}" - get :download, :id => changeset_id + get :download, :params => { :id => changeset_id } assert_response :success assert_select "osmChange", 1 @@ -1364,7 +1436,10 @@ OSMFILE # when we make some complex changes we get the same changes back from the # diff download. def test_diff_download_complex - basic_authorization(create(:user).email, "test") + node = create(:node) + node2 = create(:node) + way = create(:way) + basic_authorization create(:user).email, "test" # create a temporary changeset content "" + @@ -1375,35 +1450,35 @@ OSMFILE changeset_id = @response.body.to_i # add a diff to it - diff = < - - - - - - - - - - - - - - - - - - + diff = < + + + + + + + + + + + + + + + + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :id => changeset_id } assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" - get :download, :id => changeset_id + get :download, :params => { :id => changeset_id } assert_response :success assert_select "osmChange", 1 @@ -1417,9 +1492,15 @@ EOF end def test_changeset_download - tag = create(:old_node_tag, :old_node => nodes(:used_node_2)) + changeset = create(:changeset) + node = create(:node, :with_history, :version => 1, :changeset => changeset) + tag = create(:old_node_tag, :old_node => node.old_nodes.find_by(:version => 1)) + node2 = create(:node, :with_history, :version => 1, :changeset => changeset) + _node3 = create(:node, :with_history, :deleted, :version => 1, :changeset => changeset) + _relation = create(:relation, :with_history, :version => 1, :changeset => changeset) + _relation2 = create(:relation, :with_history, :deleted, :version => 1, :changeset => changeset) - get :download, :id => changesets(:normal_user_first_change).id + get :download, :params => { :id => changeset.id } assert_response :success assert_template nil @@ -1427,10 +1508,10 @@ EOF # FIXME: needs more assert_select tests assert_select "osmChange[version='#{API_VERSION}'][generator='#{GENERATOR}']" do assert_select "create", :count => 5 - assert_select "create>node[id='#{nodes(:used_node_2).node_id}'][visible='#{nodes(:used_node_2).visible?}'][version='#{nodes(:used_node_2).version}']" do + assert_select "create>node[id='#{node.id}'][visible='#{node.visible?}'][version='#{node.version}']" do assert_select "tag[k='#{tag.k}'][v='#{tag.v}']" end - assert_select "create>node[id='#{nodes(:visible_node).node_id}']" + assert_select "create>node[id='#{node2.id}']" end end @@ -1438,6 +1519,9 @@ EOF # check that the bounding box of a changeset gets updated correctly # FIXME: This should really be moded to a integration test due to the with_controller def test_changeset_bbox + way = create(:way) + create(:way_node, :way => way, :node => create(:node, :lat => 3, :lon => 3)) + basic_authorization create(:user).email, "test" # create a new changeset @@ -1454,12 +1538,12 @@ EOF end # get the bounding box back from the changeset - get :read, :id => changeset_id + get :read, :params => { :id => changeset_id } assert_response :success, "Couldn't read back changeset." - assert_select "osm>changeset[min_lon='1.0']", 1 - assert_select "osm>changeset[max_lon='1.0']", 1 - assert_select "osm>changeset[min_lat='2.0']", 1 - assert_select "osm>changeset[max_lat='2.0']", 1 + assert_select "osm>changeset[min_lon='1.0000000']", 1 + assert_select "osm>changeset[max_lon='1.0000000']", 1 + assert_select "osm>changeset[min_lat='2.0000000']", 1 + assert_select "osm>changeset[max_lat='2.0000000']", 1 # add another node to it with_controller(NodeController.new) do @@ -1469,29 +1553,28 @@ EOF end # get the bounding box back from the changeset - get :read, :id => changeset_id + get :read, :params => { :id => changeset_id } assert_response :success, "Couldn't read back changeset for the second time." - assert_select "osm>changeset[min_lon='1.0']", 1 - assert_select "osm>changeset[max_lon='2.0']", 1 - assert_select "osm>changeset[min_lat='1.0']", 1 - assert_select "osm>changeset[max_lat='2.0']", 1 + assert_select "osm>changeset[min_lon='1.0000000']", 1 + assert_select "osm>changeset[max_lon='2.0000000']", 1 + assert_select "osm>changeset[min_lat='1.0000000']", 1 + assert_select "osm>changeset[max_lat='2.0000000']", 1 # add (delete) a way to it, which contains a point at (3,3) with_controller(WayController.new) do - content update_changeset(current_ways(:visible_way).to_xml, - changeset_id) - put :delete, :id => current_ways(:visible_way).id + content update_changeset(way.to_xml, changeset_id) + put :delete, :params => { :id => way.id } assert_response :success, "Couldn't delete a way." end # get the bounding box back from the changeset - get :read, :id => changeset_id + get :read, :params => { :id => changeset_id } assert_response :success, "Couldn't read back changeset for the third time." # note that the 3.1 here is because of the bbox overexpansion - assert_select "osm>changeset[min_lon='1.0']", 1 - assert_select "osm>changeset[max_lon='3.1']", 1 - assert_select "osm>changeset[min_lat='1.0']", 1 - assert_select "osm>changeset[max_lat='3.1']", 1 + assert_select "osm>changeset[min_lon='1.0000000']", 1 + assert_select "osm>changeset[max_lon='3.1000000']", 1 + assert_select "osm>changeset[min_lat='1.0000000']", 1 + assert_select "osm>changeset[max_lat='3.1000000']", 1 end ## @@ -1532,17 +1615,17 @@ EOF # Try and put content "" - put :expand_bbox, :id => changeset_id + put :expand_bbox, :params => { :id => changeset_id } assert_response :method_not_allowed, "shouldn't be able to put a bbox expand" # Try to get the update content "" - get :expand_bbox, :id => changeset_id + get :expand_bbox, :params => { :id => changeset_id } assert_response :method_not_allowed, "shouldn't be able to get a bbox expand" # Try to use a hopefully missing changeset content "" - post :expand_bbox, :id => changeset_id + 13245 + post :expand_bbox, :params => { :id => changeset_id + 13245 } assert_response :not_found, "shouldn't be able to do a bbox expand on a nonexistant changeset" end @@ -1555,78 +1638,81 @@ EOF user = create(:user) changeset = create(:changeset, :user => user) closed_changeset = create(:changeset, :closed, :user => user, :created_at => Time.utc(2008, 1, 1, 0, 0, 0), :closed_at => Time.utc(2008, 1, 2, 0, 0, 0)) + changeset2 = create(:changeset, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 15 * GeoRecord::SCALE, :max_lon => 15 * GeoRecord::SCALE) + changeset3 = create(:changeset, :min_lat => 4.5 * GeoRecord::SCALE, :min_lon => 4.5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE) - get :query, :bbox => "-10,-10, 10, 10" + get :query, :params => { :bbox => "-10,-10, 10, 10" } assert_response :success, "can't get changesets in bbox" - assert_changesets [1, 4, 6] + assert_changesets [changeset2, changeset3] - get :query, :bbox => "4.5,4.5,4.6,4.6" + get :query, :params => { :bbox => "4.5,4.5,4.6,4.6" } assert_response :success, "can't get changesets in bbox" - assert_changesets [1] + assert_changesets [changeset3] # not found when looking for changesets of non-existing users - get :query, :user => User.maximum(:id) + 1 + get :query, :params => { :user => User.maximum(:id) + 1 } assert_response :not_found - get :query, :display_name => " " + get :query, :params => { :display_name => " " } assert_response :not_found # can't get changesets of user 1 without authenticating - get :query, :user => private_user.id + get :query, :params => { :user => private_user.id } assert_response :not_found, "shouldn't be able to get changesets by non-public user (ID)" - get :query, :display_name => private_user.display_name + get :query, :params => { :display_name => private_user.display_name } assert_response :not_found, "shouldn't be able to get changesets by non-public user (name)" # but this should work basic_authorization private_user.email, "test" - get :query, :user => private_user.id + get :query, :params => { :user => private_user.id } assert_response :success, "can't get changesets by user ID" - assert_changesets [private_user_changeset.id, private_user_closed_changeset.id] + assert_changesets [private_user_changeset, private_user_closed_changeset] - get :query, :display_name => private_user.display_name + get :query, :params => { :display_name => private_user.display_name } assert_response :success, "can't get changesets by user name" - assert_changesets [private_user_changeset.id, private_user_closed_changeset.id] + assert_changesets [private_user_changeset, private_user_closed_changeset] # check that the correct error is given when we provide both UID and name - get :query, :user => private_user.id, :display_name => private_user.display_name + get :query, :params => { :user => private_user.id, + :display_name => private_user.display_name } assert_response :bad_request, "should be a bad request to have both ID and name specified" - get :query, :user => private_user.id, :open => true + get :query, :params => { :user => private_user.id, :open => true } assert_response :success, "can't get changesets by user and open" - assert_changesets [private_user_changeset.id] + assert_changesets [private_user_changeset] - get :query, :time => "2007-12-31" + get :query, :params => { :time => "2007-12-31" } assert_response :success, "can't get changesets by time-since" - assert_changesets [1, 2, 4, 5, 6, private_user_changeset.id, private_user_closed_changeset.id, changeset.id, closed_changeset.id] + assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3] - get :query, :time => "2008-01-01T12:34Z" + get :query, :params => { :time => "2008-01-01T12:34Z" } assert_response :success, "can't get changesets by time-since with hour" - assert_changesets [1, 2, 4, 5, 6, private_user_changeset.id, private_user_closed_changeset.id, changeset.id, closed_changeset.id] + assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3] - get :query, :time => "2007-12-31T23:59Z,2008-01-02T00:01Z" + get :query, :params => { :time => "2007-12-31T23:59Z,2008-01-02T00:01Z" } assert_response :success, "can't get changesets by time-range" - assert_changesets [1, 5, 6, closed_changeset.id] + assert_changesets [closed_changeset] - get :query, :open => "true" + get :query, :params => { :open => "true" } assert_response :success, "can't get changesets by open-ness" - assert_changesets [1, 2, 4, private_user_changeset.id, changeset.id] + assert_changesets [private_user_changeset, changeset, changeset2, changeset3] - get :query, :closed => "true" + get :query, :params => { :closed => "true" } assert_response :success, "can't get changesets by closed-ness" - assert_changesets [3, 5, 6, 7, 8, 9, private_user_closed_changeset.id, closed_changeset.id] + assert_changesets [private_user_closed_changeset, closed_changeset] - get :query, :closed => "true", :user => private_user.id + get :query, :params => { :closed => "true", :user => private_user.id } assert_response :success, "can't get changesets by closed-ness and user" - assert_changesets [private_user_closed_changeset.id] + assert_changesets [private_user_closed_changeset] - get :query, :closed => "true", :user => user.id + get :query, :params => { :closed => "true", :user => user.id } assert_response :success, "can't get changesets by closed-ness and user" - assert_changesets [closed_changeset.id] + assert_changesets [closed_changeset] - get :query, :changesets => "#{private_user_changeset.id},#{changeset.id},#{closed_changeset.id}" + get :query, :params => { :changesets => "#{private_user_changeset.id},#{changeset.id},#{closed_changeset.id}" } assert_response :success, "can't get changesets by id (as comma-separated string)" - assert_changesets [private_user_changeset.id, changeset.id, closed_changeset.id] + assert_changesets [private_user_changeset, changeset, closed_changeset] - get :query, :changesets => "" + get :query, :params => { :changesets => "" } assert_response :bad_request, "should be a bad request since changesets is empty" end @@ -1637,7 +1723,7 @@ EOF ["abracadabra!", "1,2,3,F", ";drop table users;"].each do |bbox| - get :query, :bbox => bbox + get :query, :params => { :bbox => bbox } assert_response :bad_request, "'#{bbox}' isn't a bbox" end @@ -1646,7 +1732,7 @@ EOF ";drop table users;", ",", "-,-"].each do |time| - get :query, :time => time + get :query, :params => { :time => time } assert_response :bad_request, "'#{time}' isn't a valid time range" end @@ -1654,7 +1740,7 @@ EOF "foobar", "-1", "0"].each do |uid| - get :query, :user => uid + get :query, :params => { :user => uid } assert_response :bad_request, "'#{uid}' isn't a valid user ID" end end @@ -1676,17 +1762,17 @@ EOF content new_changeset # try without any authorization - put :update, :id => private_changeset.id + put :update, :params => { :id => private_changeset.id } assert_response :unauthorized # try with the wrong authorization basic_authorization create(:user).email, "test" - put :update, :id => private_changeset.id + put :update, :params => { :id => private_changeset.id } assert_response :conflict # now this should get an unauthorized basic_authorization private_user.email, "test" - put :update, :id => private_changeset.id + put :update, :params => { :id => private_changeset.id } assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset" ## Now try with the public user @@ -1700,17 +1786,17 @@ EOF # try without any authorization @request.env["HTTP_AUTHORIZATION"] = nil - put :update, :id => changeset.id + put :update, :params => { :id => changeset.id } assert_response :unauthorized # try with the wrong authorization basic_authorization create(:user).email, "test" - put :update, :id => changeset.id + put :update, :params => { :id => changeset.id } assert_response :conflict # now this should work... basic_authorization user.email, "test" - put :update, :id => changeset.id + put :update, :params => { :id => changeset.id } assert_response :success assert_select "osm>changeset[id='#{changeset.id}']", 1 @@ -1732,7 +1818,7 @@ EOF new_changeset.find("//osm/changeset").first << new_tag content new_changeset - put :update, :id => changeset.id + put :update, :params => { :id => changeset.id } assert_response :conflict end @@ -1763,7 +1849,7 @@ EOF assert_response :success, "can't create a new node" node_id = @response.body.to_i - get :read, :id => node_id + get :read, :params => { :id => node_id } assert_response :success, "can't read back new node" node_doc = XML::Parser.string(@response.body).parse node_xml = node_doc.find("//osm/node").first @@ -1775,7 +1861,7 @@ EOF node_xml["version"] = (i + 1).to_s content node_doc - put :update, :id => node_id + put :update, :params => { :id => node_id } assert_response :success, "attempt #{i} should have succeeded" end @@ -1785,7 +1871,7 @@ EOF node_xml["version"] = offset.to_s content node_doc - put :update, :id => node_id + put :update, :params => { :id => node_id } assert_response :conflict, "final attempt should have failed" end @@ -1801,13 +1887,13 @@ EOF ## # This should display the last 20 changesets closed def test_list - get :list, :format => "html" + get :list, :params => { :format => "html" } assert_response :success assert_template "history" assert_template :layout => "map" assert_select "h2", :text => "Changesets", :count => 1 - xhr :get, :list, :format => "html", :list => "1" + get :list, :params => { :format => "html", :list => "1" }, :xhr => true assert_response :success assert_template "list" @@ -1817,13 +1903,13 @@ EOF ## # This should display the last 20 changesets closed def test_list_xhr - xhr :get, :list, :format => "html" + get :list, :params => { :format => "html" }, :xhr => true assert_response :success assert_template "history" assert_template :layout => "xhr" assert_select "h2", :text => "Changesets", :count => 1 - xhr :get, :list, :format => "html", :list => "1" + get :list, :params => { :format => "html", :list => "1" }, :xhr => true assert_response :success assert_template "list" @@ -1833,13 +1919,13 @@ EOF ## # This should display the last 20 changesets closed in a specific area def test_list_bbox - get :list, :format => "html", :bbox => "4.5,4.5,5.5,5.5" + get :list, :params => { :format => "html", :bbox => "4.5,4.5,5.5,5.5" } assert_response :success assert_template "history" assert_template :layout => "map" assert_select "h2", :text => "Changesets", :count => 1 - xhr :get, :list, :format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1" + get :list, :params => { :format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1" }, :xhr => true assert_response :success assert_template "list" @@ -1853,11 +1939,11 @@ EOF create(:changeset, :user => user) create(:changeset, :closed, :user => user) - get :list, :format => "html", :display_name => user.display_name + get :list, :params => { :format => "html", :display_name => user.display_name } assert_response :success assert_template "history" - xhr :get, :list, :format => "html", :display_name => user.display_name, :list => "1" + get :list, :params => { :format => "html", :display_name => user.display_name, :list => "1" }, :xhr => true assert_response :success assert_template "list" @@ -1871,11 +1957,11 @@ EOF create(:changeset, :user => private_user) create(:changeset, :closed, :user => private_user) - get :list, :format => "html", :display_name => private_user.display_name + get :list, :params => { :format => "html", :display_name => private_user.display_name } assert_response :success assert_template "history" - xhr :get, :list, :format => "html", :display_name => private_user.display_name, :list => "1" + get :list, :params => { :format => "html", :display_name => private_user.display_name, :list => "1" }, :xhr => true assert_response :success assert_template "list" @@ -1885,11 +1971,11 @@ EOF ## # Check the not found of the list user changesets def test_list_user_not_found - get :list, :format => "html", :display_name => "Some random user" + get :list, :params => { :format => "html", :display_name => "Some random user" } assert_response :not_found assert_template "user/no_such_user" - xhr :get, :list, :format => "html", :display_name => "Some random user", :list => "1" + get :list, :params => { :format => "html", :display_name => "Some random user", :list => "1" }, :xhr => true assert_response :not_found assert_template "user/no_such_user" end @@ -1901,17 +1987,17 @@ EOF friend = create(:friend, :befriender => private_user) create(:changeset, :user => friend.befriendee) - get :list, :friends => true + get :list, :params => { :friends => true } assert_response :redirect assert_redirected_to :controller => :user, :action => :login, :referer => friend_changesets_path session[:user] = private_user.id - get :list, :friends => true + get :list, :params => { :friends => true } assert_response :success assert_template "history" - xhr :get, :list, :friends => true, :list => "1" + get :list, :params => { :friends => true, :list => "1" }, :xhr => true assert_response :success assert_template "list" @@ -1925,17 +2011,17 @@ EOF user = create(:user, :home_lat => 51.0, :home_lon => 1.0) create(:changeset, :user => user) - get :list, :nearby => true + get :list, :params => { :nearby => true } assert_response :redirect assert_redirected_to :controller => :user, :action => :login, :referer => nearby_changesets_path session[:user] = private_user.id - get :list, :nearby => true + get :list, :params => { :nearby => true } assert_response :success assert_template "history" - xhr :get, :list, :nearby => true, :list => "1" + get :list, :params => { :nearby => true, :list => "1" }, :xhr => true assert_response :success assert_template "list" @@ -1945,13 +2031,13 @@ EOF ## # Check that we can't request later pages of the changesets list def test_list_max_id - xhr :get, :list, :format => "html", :max_id => 4 + get :list, :params => { :format => "html", :max_id => 4 }, :xhr => true assert_response :success assert_template "history" assert_template :layout => "xhr" assert_select "h2", :text => "Changesets", :count => 1 - xhr :get, :list, :format => "html", :list => "1", :max_id => 4 + get :list, :params => { :format => "html", :list => "1", :max_id => 4 }, :xhr => true assert_response :success assert_template "list" @@ -1959,52 +2045,75 @@ EOF end ## - # This should display the last 20 changesets closed + # Check that a list with a next page link works + def test_list_more + create_list(:changeset, 50) + + get :list, :params => { :format => "html" } + assert_response :success + + get :list, :params => { :format => "html" }, :xhr => true + assert_response :success + end + + ## + # This should display the last 20 non-empty changesets def test_feed - get :feed, :format => :atom + changeset = create(:changeset, :num_changes => 1) + closed_changeset = create(:changeset, :closed, :num_changes => 1) + _empty_changeset = create(:changeset, :num_changes => 0) + + get :feed, :params => { :format => :atom } assert_response :success assert_template "list" assert_equal "application/atom+xml", response.content_type - check_feed_result(Changeset.all) + check_feed_result([changeset, closed_changeset]) end ## # This should display the last 20 changesets closed in a specific area def test_feed_bbox - get :feed, :format => :atom, :bbox => "4.5,4.5,5.5,5.5" + changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE) + closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE) + _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE) + _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE) + + get :feed, :params => { :format => :atom, :bbox => "4.5,4.5,5.5,5.5" } assert_response :success assert_template "list" assert_equal "application/atom+xml", response.content_type - check_feed_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000")) + check_feed_result([changeset, closed_changeset]) end ## # Checks the display of the user changesets feed def test_feed_user user = create(:user) - create_list(:changeset, 3, :user => user, :num_changes => 4) + changesets = create_list(:changeset, 3, :user => user, :num_changes => 4) + _other_changeset = create(:changeset) + + get :feed, :params => { :format => :atom, :display_name => user.display_name } - get :feed, :format => :atom, :display_name => user.display_name assert_response :success assert_template "list" assert_equal "application/atom+xml", response.content_type - check_feed_result(user.changesets) + check_feed_result(changesets) end ## # Check the not found of the user changesets feed def test_feed_user_not_found - get :feed, :format => "atom", :display_name => "Some random user" + get :feed, :params => { :format => "atom", :display_name => "Some random user" } assert_response :not_found end ## # Check that we can't request later pages of the changesets feed def test_feed_max_id - get :feed, :format => "atom", :max_id => 100 + get :feed, :params => { :format => "atom", :max_id => 100 } assert_response :redirect assert_redirected_to :action => :feed end @@ -2018,7 +2127,7 @@ EOF node_v1 = node.old_nodes.find_by(:version => 1) node_v1.redact!(create(:redaction)) - get :download, :id => changeset.id + get :download, :params => { :id => changeset.id } assert_response :success assert_select "osmChange", 1 @@ -2038,11 +2147,11 @@ EOF deleted_user = create(:user, :deleted) private_user_closed_changeset = create(:changeset, :closed, :user => private_user) - basic_authorization(user.email, "test") + basic_authorization user.email, "test" assert_difference "ChangesetComment.count", 1 do assert_no_difference "ActionMailer::Base.deliveries.size" do - post :comment, :id => private_user_closed_changeset.id, :text => "This is a comment" + post :comment, :params => { :id => private_user_closed_changeset.id, :text => "This is a comment" } end end assert_response :success @@ -2055,7 +2164,7 @@ EOF assert_difference "ChangesetComment.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 1 do - post :comment, :id => changeset.id, :text => "This is a comment" + post :comment, :params => { :id => changeset.id, :text => "This is a comment" } end end assert_response :success @@ -2067,11 +2176,11 @@ EOF ActionMailer::Base.deliveries.clear - basic_authorization(user2.email, "test") + basic_authorization user2.email, "test" assert_difference "ChangesetComment.count", 1 do assert_difference "ActionMailer::Base.deliveries.size", 2 do - post :comment, :id => changeset.id, :text => "This is a comment" + post :comment, :params => { :id => changeset.id, :text => "This is a comment" } end end assert_response :success @@ -2093,32 +2202,32 @@ EOF # create comment fail def test_create_comment_fail # unauthorized - post :comment, :id => create(:changeset, :closed).id, :text => "This is a comment" + post :comment, :params => { :id => create(:changeset, :closed).id, :text => "This is a comment" } assert_response :unauthorized - basic_authorization(create(:user).email, "test") + basic_authorization create(:user).email, "test" # bad changeset id assert_no_difference "ChangesetComment.count" do - post :comment, :id => 999111, :text => "This is a comment" + post :comment, :params => { :id => 999111, :text => "This is a comment" } end assert_response :not_found # not closed changeset assert_no_difference "ChangesetComment.count" do - post :comment, :id => create(:changeset).id, :text => "This is a comment" + post :comment, :params => { :id => create(:changeset).id, :text => "This is a comment" } end assert_response :conflict # no text assert_no_difference "ChangesetComment.count" do - post :comment, :id => create(:changeset, :closed).id + post :comment, :params => { :id => create(:changeset, :closed).id } end assert_response :bad_request # empty text assert_no_difference "ChangesetComment.count" do - post :comment, :id => create(:changeset, :closed).id, :text => "" + post :comment, :params => { :id => create(:changeset, :closed).id, :text => "" } end assert_response :bad_request end @@ -2126,11 +2235,11 @@ EOF ## # test subscribe success def test_subscribe_success - basic_authorization(create(:user).email, "test") + basic_authorization create(:user).email, "test" changeset = create(:changeset, :closed) assert_difference "changeset.subscribers.count", 1 do - post :subscribe, :id => changeset.id + post :subscribe, :params => { :id => changeset.id } end assert_response :success end @@ -2143,22 +2252,22 @@ EOF # unauthorized changeset = create(:changeset, :closed) assert_no_difference "changeset.subscribers.count" do - post :subscribe, :id => changeset.id + post :subscribe, :params => { :id => changeset.id } end assert_response :unauthorized - basic_authorization(user.email, "test") + basic_authorization user.email, "test" # bad changeset id assert_no_difference "changeset.subscribers.count" do - post :subscribe, :id => 999111 + post :subscribe, :params => { :id => 999111 } end assert_response :not_found # not closed changeset changeset = create(:changeset) assert_no_difference "changeset.subscribers.count" do - post :subscribe, :id => changeset.id + post :subscribe, :params => { :id => changeset.id } end assert_response :conflict @@ -2166,7 +2275,7 @@ EOF changeset = create(:changeset, :closed) changeset.subscribers.push(user) assert_no_difference "changeset.subscribers.count" do - post :subscribe, :id => changeset.id + post :subscribe, :params => { :id => changeset.id } end assert_response :conflict end @@ -2175,12 +2284,12 @@ EOF # test unsubscribe success def test_unsubscribe_success user = create(:user) - basic_authorization(user.email, "test") + basic_authorization user.email, "test" changeset = create(:changeset, :closed) changeset.subscribers.push(user) assert_difference "changeset.subscribers.count", -1 do - post :unsubscribe, :id => changeset.id + post :unsubscribe, :params => { :id => changeset.id } end assert_response :success end @@ -2191,29 +2300,29 @@ EOF # unauthorized changeset = create(:changeset, :closed) assert_no_difference "changeset.subscribers.count" do - post :unsubscribe, :id => changeset.id + post :unsubscribe, :params => { :id => changeset.id } end assert_response :unauthorized - basic_authorization(create(:user).email, "test") + basic_authorization create(:user).email, "test" # bad changeset id assert_no_difference "changeset.subscribers.count" do - post :unsubscribe, :id => 999111 + post :unsubscribe, :params => { :id => 999111 } end assert_response :not_found # not closed changeset changeset = create(:changeset) assert_no_difference "changeset.subscribers.count" do - post :unsubscribe, :id => changeset.id + post :unsubscribe, :params => { :id => changeset.id } end assert_response :conflict # trying to unsubscribe when not subscribed changeset = create(:changeset, :closed) assert_no_difference "changeset.subscribers.count" do - post :unsubscribe, :id => changeset.id + post :unsubscribe, :params => { :id => changeset.id } end assert_response :not_found end @@ -2225,21 +2334,21 @@ EOF comment = create(:changeset_comment) assert_equal true, comment.visible - post :hide_comment, :id => comment.id + post :hide_comment, :params => { :id => comment.id } assert_response :unauthorized assert_equal true, comment.reload.visible - basic_authorization(create(:user).email, "test") + basic_authorization create(:user).email, "test" # not a moderator - post :hide_comment, :id => comment.id + post :hide_comment, :params => { :id => comment.id } assert_response :forbidden assert_equal true, comment.reload.visible - basic_authorization(create(:moderator_user).email, "test") + basic_authorization create(:moderator_user).email, "test" # bad comment id - post :hide_comment, :id => 999111 + post :hide_comment, :params => { :id => 999111 } assert_response :not_found assert_equal true, comment.reload.visible end @@ -2250,9 +2359,9 @@ EOF comment = create(:changeset_comment) assert_equal true, comment.visible - basic_authorization(create(:moderator_user).email, "test") + basic_authorization create(:moderator_user).email, "test" - post :hide_comment, :id => comment.id + post :hide_comment, :params => { :id => comment.id } assert_response :success assert_equal false, comment.reload.visible end @@ -2264,21 +2373,21 @@ EOF comment = create(:changeset_comment, :visible => false) assert_equal false, comment.visible - post :unhide_comment, :id => comment.id + post :unhide_comment, :params => { :id => comment.id } assert_response :unauthorized assert_equal false, comment.reload.visible - basic_authorization(create(:user).email, "test") + basic_authorization create(:user).email, "test" # not a moderator - post :unhide_comment, :id => comment.id + post :unhide_comment, :params => { :id => comment.id } assert_response :forbidden assert_equal false, comment.reload.visible - basic_authorization(create(:moderator_user).email, "test") + basic_authorization create(:moderator_user).email, "test" # bad comment id - post :unhide_comment, :id => 999111 + post :unhide_comment, :params => { :id => 999111 } assert_response :not_found assert_equal false, comment.reload.visible end @@ -2289,9 +2398,9 @@ EOF comment = create(:changeset_comment, :visible => false) assert_equal false, comment.visible - basic_authorization(create(:moderator_user).email, "test") + basic_authorization create(:moderator_user).email, "test" - post :unhide_comment, :id => comment.id + post :unhide_comment, :params => { :id => comment.id } assert_response :success assert_equal true, comment.reload.visible end @@ -2302,7 +2411,7 @@ EOF changeset = create(:changeset, :closed) create_list(:changeset_comment, 3, :changeset => changeset) - get :comments_feed, :format => "rss" + get :comments_feed, :params => { :format => "rss" } assert_response :success assert_equal "application/rss+xml", @response.content_type assert_select "rss", :count => 1 do @@ -2311,7 +2420,7 @@ EOF end end - get :comments_feed, :format => "rss", :limit => 2 + get :comments_feed, :params => { :format => "rss", :limit => 2 } assert_response :success assert_equal "application/rss+xml", @response.content_type assert_select "rss", :count => 1 do @@ -2320,7 +2429,7 @@ EOF end end - get :comments_feed, :id => changeset.id, :format => "rss" + get :comments_feed, :params => { :id => changeset.id, :format => "rss" } assert_response :success assert_equal "application/rss+xml", @response.content_type assert_select "rss", :count => 1 do @@ -2333,10 +2442,10 @@ EOF ## # test comments feed def test_comments_feed_bad_limit - get :comments_feed, :format => "rss", :limit => 0 + get :comments_feed, :params => { :format => "rss", :limit => 0 } assert_response :bad_request - get :comments_feed, :format => "rss", :limit => 100001 + get :comments_feed, :params => { :format => "rss", :limit => 100001 } assert_response :bad_request end @@ -2345,10 +2454,10 @@ EOF ## # boilerplate for checking that certain changesets exist in the # output. - def assert_changesets(ids) - assert_select "osm>changeset", ids.size - ids.each do |id| - assert_select "osm>changeset[id='#{id}']", 1 + def assert_changesets(changesets) + assert_select "osm>changeset", changesets.size + changesets.each do |changeset| + assert_select "osm>changeset[id='#{changeset.id}']", 1 end end @@ -2356,7 +2465,7 @@ EOF # call the include method and assert properties of the bbox def check_after_include(changeset_id, lon, lat, bbox) content "" - post :expand_bbox, :id => changeset_id + post :expand_bbox, :params => { :id => changeset_id } assert_response :success, "Setting include of changeset failed: #{@response.body}" # check exactly one changeset @@ -2405,9 +2514,6 @@ EOF ## # check the result of a feed def check_feed_result(changesets) - changesets = changesets.where("num_changes > 0") - .order(:created_at => :desc) - .limit(20) assert changesets.size <= 20 assert_select "feed", :count => [changesets.size, 1].min do