X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..692c0c39b68a77057526781a83dabe56a6931fa0:/test/controllers/changeset_controller_test.rb?ds=inline diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb index 07b06e675..5f156ee1b 100644 --- a/test/controllers/changeset_controller_test.rb +++ b/test/controllers/changeset_controller_test.rb @@ -1,9 +1,8 @@ -require 'test_helper' -require 'changeset_controller' +require "test_helper" +require "changeset_controller" class ChangesetControllerTest < ActionController::TestCase api_fixtures - fixtures :changeset_comments, :changesets_subscribers ## # test all routes which lead to this controller @@ -74,11 +73,11 @@ class ChangesetControllerTest < ActionController::TestCase ) assert_routing( { :path => "/history/friends", :method => :get }, - { :controller => "changeset", :action => "list", :friends => true } + { :controller => "changeset", :action => "list", :friends => true, :format => :html } ) assert_routing( { :path => "/history/nearby", :method => :get }, - { :controller => "changeset", :action => "list", :nearby => true } + { :controller => "changeset", :action => "list", :nearby => true, :format => :html } ) assert_routing( { :path => "/history", :method => :get }, @@ -99,19 +98,19 @@ class ChangesetControllerTest < ActionController::TestCase # ----------------------- def test_create - basic_authorization users(:normal_user).email, "test" + basic_authorization create(:user, :data_public => false).email, "test" # Create the first user's changeset content "" + - "" + - "" + "" + + "" put :create assert_require_public_data - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" # Create the first user's changeset content "" + - "" + - "" + "" + + "" put :create assert_response :success, "Creation of changeset did not return sucess status" @@ -134,13 +133,13 @@ class ChangesetControllerTest < ActionController::TestCase end def test_create_invalid - basic_authorization users(:normal_user).email, "test" + basic_authorization create(:user, :data_public => false).email, "test" content "" put :create assert_require_public_data ## Try the public user - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" content "" put :create assert_response :bad_request, "creating a invalid changeset should fail" @@ -151,24 +150,24 @@ class ChangesetControllerTest < ActionController::TestCase put :create assert_response :unauthorized, "shouldn't be able to create a changeset with no auth" - ## Now try to with the non-public user - basic_authorization users(:normal_user).email, "test" + ## Now try to with a non-public user + basic_authorization create(:user, :data_public => false).email, "test" put :create assert_require_public_data - ## Try the inactive user - basic_authorization users(:inactive_user).email, "test" + ## Try an inactive user + basic_authorization create(:user, :pending).email, "test" put :create assert_inactive_user - ## Now try to use the public user - basic_authorization users(:public_user).email, "test" + ## Now try to use a normal user + basic_authorization create(:user).email, "test" put :create assert_response :bad_request, "creating a changeset with no content should fail" end def test_create_wrong_method - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" get :create assert_response :method_not_allowed post :create @@ -179,7 +178,8 @@ class ChangesetControllerTest < ActionController::TestCase # check that the changeset can be read and returns the correct # document structure. def test_read - changeset_id = changesets(:normal_user_first_change).id + changeset_id = create(:changeset).id + get :read, :id => changeset_id assert_response :success, "cannot get first changeset" @@ -193,6 +193,18 @@ class ChangesetControllerTest < ActionController::TestCase assert_select "osm[version='#{API_VERSION}'][generator='OpenStreetMap server']", 1 assert_select "osm>changeset[id='#{changeset_id}']", 1 assert_select "osm>changeset>discussion", 1 + assert_select "osm>changeset>discussion>comment", 0 + + changeset_id = create(:changeset, :closed).id + create_list(:changeset_comment, 3, :changeset_id => changeset_id) + + get :read, :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 + assert_select "osm>changeset[id='#{changeset_id}']", 1 + assert_select "osm>changeset>discussion", 1 + assert_select "osm>changeset>discussion>comment", 3 end ## @@ -211,19 +223,24 @@ class ChangesetControllerTest < ActionController::TestCase ## # test that the user who opened a change can close it def test_close + private_user = create(:user, :data_public => false) + private_changeset = create(:changeset, :user => private_user) + user = create(:user) + changeset = create(:changeset, :user => user) + ## Try without authentication - put :close, :id => changesets(:public_user_first_change).id + put :close, :id => changeset.id assert_response :unauthorized ## Try using the non-public user - basic_authorization users(:normal_user).email, "test" - put :close, :id => changesets(:normal_user_first_change).id + basic_authorization private_user.email, "test" + put :close, :id => private_changeset.id assert_require_public_data ## The try with the public user - basic_authorization users(:public_user).email, "test" + basic_authorization user.email, "test" - cs_id = changesets(:public_user_first_change).id + cs_id = changeset.id put :close, :id => cs_id assert_response :success @@ -236,9 +253,12 @@ class ChangesetControllerTest < ActionController::TestCase ## # test that a different user can't close another user's changeset def test_close_invalid - basic_authorization users(:public_user).email, "test" + user = create(:user) + changeset = create(:changeset) + + basic_authorization user.email, "test" - put :close, :id => changesets(:normal_user_first_change).id + put :close, :id => changeset.id assert_response :conflict assert_equal "The user doesn't own that changeset", @response.body end @@ -246,13 +266,15 @@ class ChangesetControllerTest < ActionController::TestCase ## # test that you can't close using another method def test_close_method_invalid - basic_authorization users(:public_user).email, "test" + user = create(:user) + changeset = create(:changeset, :user => user) - cs_id = changesets(:public_user_first_change).id - get :close, :id => cs_id + basic_authorization user.email, "test" + + get :close, :id => changeset.id assert_response :method_not_allowed - post :close, :id => cs_id + post :close, :id => changeset.id assert_response :method_not_allowed end @@ -272,7 +294,7 @@ class ChangesetControllerTest < ActionController::TestCase end # Now try with auth - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" cs_ids.each do |id| begin put :close, :id => id @@ -288,24 +310,38 @@ class ChangesetControllerTest < ActionController::TestCase # be read back ok # Also try without auth and another user. def test_upload_simple_valid + private_user = create(:user, :data_public => false) + private_changeset = create(:changeset, :user => private_user) + user = create(:user) + changeset = create(:changeset, :user => user) + + node = create(:node) + way = create(:way) + relation = create(:relation) + other_relation = create(:relation) + # create some tags, since we test that they are removed later + create(:node_tag, :node => node) + create(:way_tag, :way => way) + create(:relation_tag, :relation => relation) + ## Try with no auth - changeset_id = changesets(:public_user_first_change).id + changeset_id = changeset.id # simple diff to change a node, way and relation by removing # their tags diff = < - - - + + + - - - - + + + + @@ -315,27 +351,27 @@ EOF content diff post :upload, :id => changeset_id assert_response :unauthorized, - "shouldnn't be able to upload a simple valid diff to changeset: #{@response.body}" + "shouldn't be able to upload a simple valid diff to changeset: #{@response.body}" ## Now try with a private user - basic_authorization users(:normal_user).email, "test" - changeset_id = changesets(:normal_user_first_change).id + basic_authorization private_user.email, "test" + changeset_id = private_changeset.id # simple diff to change a node, way and relation by removing # their tags diff = < - - - + + + - - - - + + + + @@ -348,24 +384,24 @@ EOF "can't upload a simple valid diff to changeset: #{@response.body}" ## Now try with the public user - basic_authorization users(:public_user).email, "test" - changeset_id = changesets(:public_user_first_change).id + basic_authorization user.email, "test" + changeset_id = changeset.id # simple diff to change a node, way and relation by removing # their tags diff = < - - - + + + - - - - + + + + @@ -378,34 +414,39 @@ EOF "can't upload a simple valid diff to changeset: #{@response.body}" # check that the changes made it into the database - assert_equal 0, Node.find(1).tags.size, "node 1 should now have no tags" - assert_equal 0, Way.find(1).tags.size, "way 1 should now have no tags" - assert_equal 0, Relation.find(1).tags.size, "relation 1 should now have no tags" + assert_equal 0, Node.find(node.id).tags.size, "node #{node.id} should now have no tags" + assert_equal 0, Way.find(way.id).tags.size, "way #{way.id} should now have no tags" + assert_equal 0, Relation.find(relation.id).tags.size, "relation #{relation.id} should now have no tags" end ## # upload something which creates new objects using placeholders def test_upload_create_valid - basic_authorization users(:public_user).email, "test" - cs_id = changesets(:public_user_first_change).id + 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 = < - + - - + + - - - - + + + + @@ -413,7 +454,7 @@ EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :id => changeset.id assert_response :success, "can't upload a simple valid creation to changeset: #{@response.body}" @@ -449,28 +490,36 @@ EOF # test a complex delete where we delete elements which rely on eachother # in the same transaction. def test_upload_delete - basic_authorization users(:public_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| 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, :id => changeset.id assert_response :success, "can't upload a deletion diff to changeset: #{@response.body}" @@ -480,25 +529,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 users(:public_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, :id => changeset.id assert_response :success, "can't upload a deletion diff to changeset: #{@response.body}" @@ -511,22 +560,21 @@ EOF def test_repeated_changeset_create 30.times do - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" # create a temporary changeset content "" + - "" + - "" - assert_difference('Changeset.count', 1) do + "" + + "" + assert_difference "Changeset.count", 1 do put :create end assert_response :success - changeset_id = @response.body.to_i end end def test_upload_large_changeset - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" # create a changeset content "" @@ -571,55 +619,87 @@ EOF # check that the changeset bbox is within bounds cs = Changeset.find(changeset_id) assert cs.min_lon >= -180 * GeoRecord::SCALE, "Minimum longitude (#{cs.min_lon / GeoRecord::SCALE}) should be >= -180 to be valid." - assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid." - assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid." - assert cs.max_lat >= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid." + assert cs.max_lon <= 180 * GeoRecord::SCALE, "Maximum longitude (#{cs.max_lon / GeoRecord::SCALE}) should be <= 180 to be valid." + assert cs.min_lat >= -90 * GeoRecord::SCALE, "Minimum latitude (#{cs.min_lat / GeoRecord::SCALE}) should be >= -90 to be valid." + assert cs.max_lat >= 90 * GeoRecord::SCALE, "Maximum latitude (#{cs.max_lat / GeoRecord::SCALE}) should be <= 90 to be valid." end ## # 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 users(:public_user).email, "test" + 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 => 2 + post :upload, :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 users(:public_user).email, "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.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 => 2 + post :upload, :id => changeset.id assert_response :success, "can't do a conditional delete of in use objects: #{@response.body}" @@ -633,38 +713,39 @@ 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 users(:public_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 = < - - + + @@ -672,7 +753,7 @@ EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :id => changeset.id assert_response :bad_request, "shoudln't be able to upload too long a tag to changeset: #{@response.body}" end @@ -681,27 +762,33 @@ EOF # upload something which creates new objects and inserts them into # existing containers using placeholders. def test_upload_complex - basic_authorization users(:public_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 = < - + - + - + - - + + - + @@ -709,7 +796,7 @@ EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :id => changeset.id assert_response :success, "can't upload a complex diff to changeset: #{@response.body}" @@ -725,9 +812,9 @@ 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| - if type == 'node' + 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 end @@ -737,54 +824,58 @@ 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 users(:public_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 = < - - - + + + - - - - + + + + - + 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, :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_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 users(:public_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 @@ -792,21 +883,21 @@ EOF diff = < - - - - - - - - + + + + + + + + EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :id => changeset.id assert_response :success, "can't upload multiple versions of an element in a diff: #{@response.body}" @@ -820,21 +911,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 users(:public_user).email, "test" - cs_id = changesets(:public_user_first_change).id + 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, :id => changeset.id assert_response :conflict, "shouldn't be able to upload the same element twice in a diff: #{@response.body}" end @@ -842,20 +935,21 @@ EOF ## # try to upload some elements without specifying the version def test_upload_missing_version - basic_authorization users(:public_user).email, "test" - cs_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" diff = < - + EOF # upload it content diff - post :upload, :id => cs_id + post :upload, :id => changeset.id assert_response :bad_request, "shouldn't be able to upload an element without version: #{@response.body}" end @@ -863,18 +957,19 @@ EOF ## # try to upload with commands other than create, modify, or delete def test_action_upload_invalid - basic_authorization users(:public_user).email, "test" - cs_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" diff = < - + EOF content diff - post :upload, :id => cs_id + post :upload, :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 @@ -883,26 +978,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 users(:public_user).email, "test" - changeset_id = changesets(:public_user_first_change).id + 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, :id => changeset.id assert_response :success, "can't upload a valid diff with whitespace variations to changeset: #{@response.body}" @@ -911,36 +1012,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 users(:public_user).email, "test" - changeset_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" diff = < - + - + - + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :id => changeset.id assert_response :success, "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}" @@ -953,22 +1054,23 @@ EOF # test what happens if a diff upload re-uses placeholder IDs in an # illegal way. def test_upload_placeholder_invalid - basic_authorization users(:public_user).email, "test" - changeset_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" diff = < - - - + + + EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :id => changeset.id assert_response :bad_request, "shouldn't be able to re-use placeholder IDs" end @@ -977,16 +1079,18 @@ EOF # test that uploading a way referencing invalid placeholders gives a # proper error, not a 500. def test_upload_placeholder_invalid_way - basic_authorization users(:public_user).email, "test" - changeset_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + way = create(:way) + + basic_authorization changeset.user.email, "test" diff = < - - - - + + + + @@ -998,7 +1102,7 @@ EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :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 @@ -1007,10 +1111,10 @@ EOF diff = < - - - - + + + + @@ -1022,26 +1126,28 @@ EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :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 users(:public_user).email, "test" - changeset_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + relation = create(:relation) + + basic_authorization changeset.user.email, "test" diff = < - - - - + + + + @@ -1053,19 +1159,19 @@ EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :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 + # the same again, but this time use an existing relation diff = < - - - - + + + + @@ -1077,33 +1183,33 @@ EOF # upload it content diff - post :upload, :id => changeset_id + post :upload, :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 ## # test what happens if a diff is uploaded containing only a node # move. def test_upload_node_move - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" content "" + - "" + - "" + "" + + "" put :create 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" modify = XML::Node.new "modify" xml_old_node = old_node.to_xml_node - xml_old_node["lat"] = (2.0).to_s - xml_old_node["lon"] = (2.0).to_s + xml_old_node["lat"] = 2.0.to_s + xml_old_node["lon"] = 2.0.to_s xml_old_node["changeset"] = changeset_id.to_s modify << xml_old_node diff.root << modify @@ -1125,23 +1231,24 @@ EOF ## # test what happens if a diff is uploaded adding a node to a way. def test_upload_way_extend - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" content "" + - "" + - "" + "" + + "" put :create 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 @@ -1164,16 +1271,17 @@ EOF ## # test for more issues in #1568 def test_upload_empty_invalid - basic_authorization users(:public_user).email, "test" + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" ["", "", "", - "" - ].each do |diff| + ""].each do |diff| # upload it content diff - post :upload, :id => changesets(:public_user_first_change).id + post :upload, :id => changeset.id assert_response(:success, "should be able to upload " + "empty changeset: " + diff) end @@ -1182,19 +1290,23 @@ EOF ## # test that the X-Error-Format header works to request XML errors def test_upload_xml_errors - basic_authorization users(:public_user).email, "test" + 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 => 2 + post :upload, :id => changeset.id assert_response :success, "failed to return error in XML format" @@ -1208,23 +1320,25 @@ EOF # when we make some simple changes we get the same changes back from the # diff download. def test_diff_download_simple - ## First try with the normal user, which should get a forbidden - basic_authorization(users(:normal_user).email, "test") + node = create(:node) + + ## First try with a non-public user, which should get a forbidden + basic_authorization(create(:user, :data_public => false).email, "test") # create a temporary changeset content "" + - "" + - "" + "" + + "" put :create assert_response :forbidden - ## Now try with the public user - basic_authorization(users(:public_user).email, "test") + ## Now try with a normal user + basic_authorization(create(:user).email, "test") # create a temporary changeset content "" + - "" + - "" + "" + + "" put :create assert_response :success changeset_id = @response.body.to_i @@ -1233,14 +1347,14 @@ EOF diff = < - - - - - - - - + + + + + + + + EOF @@ -1265,12 +1379,12 @@ EOF # # NOTE: the error turned out to be something else completely! def test_josm_upload - basic_authorization(users(:public_user).email, "test") + basic_authorization(create(:user).email, "test") # create a temporary changeset content "" + - "" + - "" + "" + + "" put :create assert_response :success changeset_id = @response.body.to_i @@ -1324,12 +1438,15 @@ OSMFILE # when we make some complex changes we get the same changes back from the # diff download. def test_diff_download_complex - basic_authorization(users(:public_user).email, "test") + node = create(:node) + node2 = create(:node) + way = create(:way) + basic_authorization(create(:user).email, "test") # create a temporary changeset content "" + - "" + - "" + "" + + "" put :create assert_response :success changeset_id = @response.body.to_i @@ -1338,7 +1455,7 @@ OSMFILE diff = < - + @@ -1346,9 +1463,9 @@ OSMFILE - - - + + + @@ -1377,25 +1494,37 @@ EOF end def test_changeset_download - get :download, :id => changesets(:normal_user_first_change).id + 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 => changeset.id + assert_response :success assert_template nil # print @response.body - # FIXME needs more assert_select tests + # 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 "tag[k='#{node_tags(:t3).k}'][v='#{node_tags(:t3).v}']" + 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 ## # 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 + # FIXME: This should really be moded to a integration test due to the with_controller def test_changeset_bbox - basic_authorization users(:public_user).email, "test" + 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 content "" @@ -1435,9 +1564,8 @@ EOF # 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, :id => way.id assert_response :success, "Couldn't delete a way." end @@ -1454,7 +1582,7 @@ EOF ## # test that the changeset :include method works as it should def test_changeset_include - basic_authorization users(:public_user).display_name, "test" + basic_authorization create(:user).display_name, "test" # create a new changeset content "" @@ -1465,18 +1593,18 @@ EOF # NOTE: the include method doesn't over-expand, like inserting # a real method does. this is because we expect the client to # know what it is doing! - check_after_include(changeset_id, 1, 1, [1, 1, 1, 1]) - check_after_include(changeset_id, 3, 3, [1, 1, 3, 3]) - check_after_include(changeset_id, 4, 2, [1, 1, 4, 3]) - check_after_include(changeset_id, 2, 2, [1, 1, 4, 3]) - check_after_include(changeset_id, -1, -1, [-1, -1, 4, 3]) - check_after_include(changeset_id, -2, 5, [-2, -1, 4, 5]) + check_after_include(changeset_id, 1, 1, [1, 1, 1, 1]) + check_after_include(changeset_id, 3, 3, [1, 1, 3, 3]) + check_after_include(changeset_id, 4, 2, [1, 1, 4, 3]) + check_after_include(changeset_id, 2, 2, [1, 1, 4, 3]) + check_after_include(changeset_id, -1, -1, [-1, -1, 4, 3]) + check_after_include(changeset_id, -2, 5, [-2, -1, 4, 5]) end ## # test that a not found, wrong method with the expand bbox works as expected def test_changeset_expand_bbox_error - basic_authorization users(:public_user).display_name, "test" + basic_authorization create(:user).display_name, "test" # create a new changeset content "" @@ -1506,6 +1634,13 @@ EOF ## # test the query functionality of changesets def test_query + private_user = create(:user, :data_public => false) + private_user_changeset = create(:changeset, :user => private_user) + private_user_closed_changeset = create(:changeset, :closed, :user => private_user) + 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)) + get :query, :bbox => "-10,-10, 10, 10" assert_response :success, "can't get changesets in bbox" assert_changesets [1, 4, 6] @@ -1521,62 +1656,62 @@ EOF assert_response :not_found # can't get changesets of user 1 without authenticating - get :query, :user => users(:normal_user).id + get :query, :user => private_user.id assert_response :not_found, "shouldn't be able to get changesets by non-public user (ID)" - get :query, :display_name => users(:normal_user).display_name + get :query, :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 "test@openstreetmap.org", "test" - get :query, :user => users(:normal_user).id + basic_authorization private_user.email, "test" + get :query, :user => private_user.id assert_response :success, "can't get changesets by user ID" - assert_changesets [1, 3, 6, 8] + assert_changesets [private_user_changeset.id, private_user_closed_changeset.id] - get :query, :display_name => users(:normal_user).display_name + get :query, :display_name => private_user.display_name assert_response :success, "can't get changesets by user name" - assert_changesets [1, 3, 6, 8] + assert_changesets [private_user_changeset.id, private_user_closed_changeset.id] # check that the correct error is given when we provide both UID and name - get :query, :user => users(:normal_user).id, :display_name => users(:normal_user).display_name + get :query, :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 => users(:normal_user).id, :open => true + get :query, :user => private_user.id, :open => true assert_response :success, "can't get changesets by user and open" - assert_changesets [1] + assert_changesets [private_user_changeset.id] - get :query, :time => '2007-12-31' + get :query, :time => "2007-12-31" assert_response :success, "can't get changesets by time-since" - assert_changesets [1, 2, 4, 5, 6] + assert_changesets [1, 2, 4, 5, 6, private_user_changeset.id, private_user_closed_changeset.id, changeset.id, closed_changeset.id] - get :query, :time => '2008-01-01T12:34Z' + get :query, :time => "2008-01-01T12:34Z" assert_response :success, "can't get changesets by time-since with hour" - assert_changesets [1, 2, 4, 5, 6] + assert_changesets [1, 2, 4, 5, 6, private_user_changeset.id, private_user_closed_changeset.id, changeset.id, closed_changeset.id] - get :query, :time => '2007-12-31T23:59Z,2008-01-01T00:01Z' + get :query, :time => "2007-12-31T23:59Z,2008-01-02T00:01Z" assert_response :success, "can't get changesets by time-range" - assert_changesets [1, 5, 6] + assert_changesets [1, 5, 6, closed_changeset.id] - get :query, :open => 'true' + get :query, :open => "true" assert_response :success, "can't get changesets by open-ness" - assert_changesets [1, 2, 4] + assert_changesets [1, 2, 4, private_user_changeset.id, changeset.id] - get :query, :closed => 'true' + get :query, :closed => "true" assert_response :success, "can't get changesets by closed-ness" - assert_changesets [3, 5, 6, 7, 8] + assert_changesets [3, 5, 6, 7, 8, 9, private_user_closed_changeset.id, closed_changeset.id] - get :query, :closed => 'true', :user => users(:normal_user).id + get :query, :closed => "true", :user => private_user.id assert_response :success, "can't get changesets by closed-ness and user" - assert_changesets [3, 6, 8] + assert_changesets [private_user_closed_changeset.id] - get :query, :closed => 'true', :user => users(:public_user).id + get :query, :closed => "true", :user => user.id assert_response :success, "can't get changesets by closed-ness and user" - assert_changesets [7] + assert_changesets [closed_changeset.id] - get :query, :changesets => '1,2,3' + get :query, :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 [1, 2, 3] + assert_changesets [private_user_changeset.id, changeset.id, closed_changeset.id] - get :query, :changesets => '' + get :query, :changesets => "" assert_response :bad_request, "should be a bad request since changesets is empty" end @@ -1586,8 +1721,7 @@ EOF def test_query_invalid ["abracadabra!", "1,2,3,F", - ";drop table users;" - ].each do |bbox| + ";drop table users;"].each do |bbox| get :query, :bbox => bbox assert_response :bad_request, "'#{bbox}' isn't a bbox" end @@ -1596,8 +1730,7 @@ EOF "00-00-00", ";drop table users;", ",", - "-,-" - ].each do |time| + "-,-"].each do |time| get :query, :time => time assert_response :bad_request, "'#{time}' isn't a valid time range" end @@ -1605,8 +1738,7 @@ EOF ["me", "foobar", "-1", - "0" - ].each do |uid| + "0"].each do |uid| get :query, :user => uid assert_response :bad_request, "'#{uid}' isn't a valid user ID" end @@ -1615,35 +1747,39 @@ EOF ## # check updating tags on a changeset def test_changeset_update - ## First try with the non-public user - changeset = changesets(:normal_user_first_change) - new_changeset = changeset.to_xml + private_user = create(:user, :data_public => false) + private_changeset = create(:changeset, :user => private_user) + user = create(:user) + changeset = create(:changeset, :user => user) + + ## First try with a non-public user + new_changeset = private_changeset.to_xml new_tag = XML::Node.new "tag" - new_tag['k'] = "tagtesting" - new_tag['v'] = "valuetesting" + new_tag["k"] = "tagtesting" + new_tag["v"] = "valuetesting" new_changeset.find("//osm/changeset").first << new_tag content new_changeset # try without any authorization - put :update, :id => changeset.id + put :update, :id => private_changeset.id assert_response :unauthorized # try with the wrong authorization - basic_authorization users(:public_user).email, "test" - put :update, :id => changeset.id + basic_authorization create(:user).email, "test" + put :update, :id => private_changeset.id assert_response :conflict # now this should get an unauthorized - basic_authorization users(:normal_user).email, "test" - put :update, :id => changeset.id + basic_authorization private_user.email, "test" + put :update, :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 - changeset = changesets(:public_user_first_change) + create(:changeset_tag, :changeset => changeset) new_changeset = changeset.to_xml new_tag = XML::Node.new "tag" - new_tag['k'] = "tagtesting" - new_tag['v'] = "valuetesting" + new_tag["k"] = "tagtesting" + new_tag["v"] = "valuetesting" new_changeset.find("//osm/changeset").first << new_tag content new_changeset @@ -1653,12 +1789,12 @@ EOF assert_response :unauthorized # try with the wrong authorization - basic_authorization users(:second_public_user).email, "test" + basic_authorization create(:user).email, "test" put :update, :id => changeset.id assert_response :conflict # now this should work... - basic_authorization users(:public_user).email, "test" + basic_authorization user.email, "test" put :update, :id => changeset.id assert_response :success @@ -1671,13 +1807,13 @@ EOF # check that a user different from the one who opened the changeset # can't modify it. def test_changeset_update_invalid - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" - changeset = changesets(:normal_user_first_change) + changeset = create(:changeset) new_changeset = changeset.to_xml new_tag = XML::Node.new "tag" - new_tag['k'] = "testing" - new_tag['v'] = "testing" + new_tag["k"] = "testing" + new_tag["v"] = "testing" new_changeset.find("//osm/changeset").first << new_tag content new_changeset @@ -1689,7 +1825,7 @@ EOF # check that a changeset can contain a certain max number of changes. ## FIXME should be changed to an integration test due to the with_controller def test_changeset_limits - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" # open a new changeset content "" @@ -1719,9 +1855,9 @@ EOF # loop until we fill the changeset with nodes offset.times do |i| - node_xml['lat'] = rand.to_s - node_xml['lon'] = rand.to_s - node_xml['version'] = (i + 1).to_s + node_xml["lat"] = rand.to_s + node_xml["lon"] = rand.to_s + node_xml["version"] = (i + 1).to_s content node_doc put :update, :id => node_id @@ -1729,9 +1865,9 @@ EOF end # trying again should fail - node_xml['lat'] = rand.to_s - node_xml['lon'] = rand.to_s - node_xml['version'] = offset.to_s + node_xml["lat"] = rand.to_s + node_xml["lon"] = rand.to_s + node_xml["version"] = offset.to_s content node_doc put :update, :id => node_id @@ -1748,7 +1884,7 @@ EOF end ## - # This should display the last 20 changesets closed. + # This should display the last 20 changesets closed def test_list get :list, :format => "html" assert_response :success @@ -1756,25 +1892,15 @@ EOF assert_template :layout => "map" assert_select "h2", :text => "Changesets", :count => 1 - get :list, :format => "html", :list => '1', :bbox => '-180,-90,90,180' + xhr :get, :list, :format => "html", :list => "1" assert_response :success assert_template "list" - changesets = Changeset - .where("num_changes > 0 and min_lon is not null") - .order(:created_at => :desc) - .limit(20) - assert changesets.size <= 20 - - # Now check that all 20 (or however many were returned) changesets are in the html - assert_select "li", :count => changesets.size - changesets.each do |_changeset| - # FIXME this test needs rewriting - test for table contents - end + check_list_result(Changeset.all) end ## - # This should display the last 20 changesets closed. + # This should display the last 20 changesets closed def test_list_xhr xhr :get, :list, :format => "html" assert_response :success @@ -1782,31 +1908,63 @@ EOF assert_template :layout => "xhr" assert_select "h2", :text => "Changesets", :count => 1 - get :list, :format => "html", :list => '1', :bbox => '-180,-90,90,180' + xhr :get, :list, :format => "html", :list => "1" assert_response :success assert_template "list" - changesets = Changeset - .where("num_changes > 0 and min_lon is not null") - .order(:created_at => :desc) - .limit(20) - assert changesets.size <= 20 + check_list_result(Changeset.all) + end - # Now check that all 20 (or however many were returned) changesets are in the html - assert_select "li", :count => changesets.size - changesets.each do |_changeset| - # FIXME this test needs rewriting - test for table contents - end + ## + # 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" + 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" + assert_response :success + assert_template "list" + + check_list_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000")) end ## # Checks the display of the user changesets listing def test_list_user - user = users(:public_user) + user = create(:user) + create(:changeset, :user => user) + create(:changeset, :closed, :user => user) + get :list, :format => "html", :display_name => user.display_name assert_response :success assert_template "history" - ## FIXME need to add more checks to see which if edits are actually shown if your data is public + + xhr :get, :list, :format => "html", :display_name => user.display_name, :list => "1" + assert_response :success + assert_template "list" + + check_list_result(user.changesets) + end + + ## + # Checks the display of the user changesets listing for a private user + def test_list_private_user + private_user = create(:user, :data_public => false) + create(:changeset, :user => private_user) + create(:changeset, :closed, :user => private_user) + + get :list, :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" + assert_response :success + assert_template "list" + + check_list_result(Changeset.none) end ## @@ -1814,34 +1972,120 @@ EOF def test_list_user_not_found get :list, :format => "html", :display_name => "Some random user" assert_response :not_found - assert_template 'user/no_such_user' + assert_template "user/no_such_user" + + xhr :get, :list, :format => "html", :display_name => "Some random user", :list => "1" + assert_response :not_found + assert_template "user/no_such_user" + end + + ## + # Checks the display of the friends changesets listing + def test_list_friends + private_user = create(:user, :data_public => true) + friend = create(:friend, :befriender => private_user) + create(:changeset, :user => friend.befriendee) + + get :list, :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 + assert_response :success + assert_template "history" + + xhr :get, :list, :friends => true, :list => "1" + assert_response :success + assert_template "list" + + check_list_result(Changeset.where(:user => private_user.friend_users.identifiable)) + end + + ## + # Checks the display of the nearby user changesets listing + def test_list_nearby + private_user = create(:user, :data_public => false, :home_lat => 51.1, :home_lon => 1.0) + user = create(:user, :home_lat => 51.0, :home_lon => 1.0) + create(:changeset, :user => user) + + get :list, :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 + assert_response :success + assert_template "history" + + xhr :get, :list, :nearby => true, :list => "1" + assert_response :success + assert_template "list" + + check_list_result(Changeset.where(:user => user.nearby)) + end + + ## + # 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 + 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 + assert_response :success + assert_template "list" + + check_list_result(Changeset.where("id <= 4")) end ## - # This should display the last 20 changesets closed. + # This should display the last 20 changesets closed def test_feed - changesets = Changeset.where("num_changes > 0").order(:created_at => :desc).limit(20) - assert changesets.size <= 20 - get :feed, :format => "atom" + changeset = create(:changeset, :num_changes => 1) + _empty_changeset = create(:changeset, :num_changes => 0) + + get :feed, :format => :atom assert_response :success assert_template "list" - # Now check that all 20 (or however many were returned) changesets are in the html - assert_select "feed", :count => 1 - assert_select "entry", :count => changesets.size - changesets.each do |_changeset| - # FIXME this test needs rewriting - test for feed contents - end + assert_equal "application/atom+xml", response.content_type + + check_feed_result([changeset]) + end + + ## + # This should display the last 20 changesets closed in a specific area + def test_feed_bbox + 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, :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, closed_changeset]) end ## # Checks the display of the user changesets feed def test_feed_user - user = users(:public_user) - get :feed, :format => "atom", :display_name => user.display_name + user = create(:user) + changesets = create_list(:changeset, 3, :user => user, :num_changes => 4) + _other_changeset = create(:changeset) + + get :feed, :format => :atom, :display_name => user.display_name assert_response :success assert_template "list" assert_equal "application/atom+xml", response.content_type - ## FIXME need to add more checks to see which if edits are actually shown if your data is public + + check_feed_result(changesets) end ## @@ -1851,63 +2095,124 @@ EOF 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 + assert_response :redirect + assert_redirected_to :action => :feed + end + ## # check that the changeset download for a changeset with a redacted # element in it doesn't contain that element. def test_diff_download_redacted - changeset_id = changesets(:public_user_first_change).id + changeset = create(:changeset) + node = create(:node, :with_history, :version => 2, :changeset => changeset) + node_v1 = node.old_nodes.find_by(:version => 1) + node_v1.redact!(create(:redaction)) - get :download, :id => changeset_id + get :download, :id => changeset.id assert_response :success assert_select "osmChange", 1 - # this changeset contains node 17 in versions 1 & 2, but 1 should + # this changeset contains the node in versions 1 & 2, but 1 should # be hidden. - assert_select "osmChange node[id='17']", 1 - assert_select "osmChange node[id='17'][version='1']", 0 + assert_select "osmChange node[id='#{node.id}']", 1 + assert_select "osmChange node[id='#{node.id}'][version='1']", 0 end ## # create comment success def test_create_comment_success - basic_authorization(users(:public_user).email, 'test') + user = create(:user) + user2 = create(:user) + private_user = create(:user, :data_public => false) + suspended_user = create(:user, :suspended) + deleted_user = create(:user, :deleted) + private_user_closed_changeset = create(:changeset, :closed, :user => private_user) + + 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" + end + end + assert_response :success + + changeset = create(:changeset, :closed, :user => private_user) + changeset.subscribers.push(private_user) + changeset.subscribers.push(user) + changeset.subscribers.push(suspended_user) + changeset.subscribers.push(deleted_user) + + assert_difference "ChangesetComment.count", 1 do + assert_difference "ActionMailer::Base.deliveries.size", 1 do + post :comment, :id => changeset.id, :text => "This is a comment" + end + end + assert_response :success + + email = ActionMailer::Base.deliveries.first + assert_equal 1, email.to.length + assert_equal "[OpenStreetMap] #{user.display_name} has commented on one of your changesets", email.subject + assert_equal private_user.email, email.to.first + + ActionMailer::Base.deliveries.clear + + basic_authorization(user2.email, "test") - assert_difference('ChangesetComment.count') do - post :comment, :id => changesets(:normal_user_closed_change).id, :text => 'This is a comment' + assert_difference "ChangesetComment.count", 1 do + assert_difference "ActionMailer::Base.deliveries.size", 2 do + post :comment, :id => changeset.id, :text => "This is a comment" + end end assert_response :success + + email = ActionMailer::Base.deliveries.find { |e| e.to.first == private_user.email } + assert_not_nil email + assert_equal 1, email.to.length + assert_equal "[OpenStreetMap] #{user2.display_name} has commented on one of your changesets", email.subject + + email = ActionMailer::Base.deliveries.find { |e| e.to.first == user.email } + assert_not_nil email + assert_equal 1, email.to.length + assert_equal "[OpenStreetMap] #{user2.display_name} has commented on a changeset you are interested in", email.subject + + ActionMailer::Base.deliveries.clear end ## # create comment fail def test_create_comment_fail # unauthorized - post :comment, :id => changesets(:normal_user_closed_change).id, :text => 'This is a comment' + post :comment, :id => create(:changeset, :closed).id, :text => "This is a comment" assert_response :unauthorized - basic_authorization(users(:public_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' + assert_no_difference "ChangesetComment.count" do + post :comment, :id => 999111, :text => "This is a comment" end assert_response :not_found # not closed changeset - assert_no_difference('ChangesetComment.count') do - post :comment, :id => changesets(:normal_user_first_change).id, :text => 'This is a comment' + assert_no_difference "ChangesetComment.count" do + post :comment, :id => create(:changeset).id, :text => "This is a comment" end assert_response :conflict # no text - assert_no_difference('ChangesetComment.count') do - post :comment, :id => changesets(:normal_user_closed_change).id + assert_no_difference "ChangesetComment.count" do + post :comment, :id => create(:changeset, :closed).id end assert_response :bad_request # empty text - assert_no_difference('ChangesetComment.count') do - post :comment, :id => changesets(:normal_user_closed_change).id, :text => '' + assert_no_difference "ChangesetComment.count" do + post :comment, :id => create(:changeset, :closed).id, :text => "" end assert_response :bad_request end @@ -1915,10 +2220,10 @@ EOF ## # test subscribe success def test_subscribe_success - basic_authorization(users(:public_user).email, 'test') - changeset = changesets(:normal_user_closed_change) + basic_authorization(create(:user).email, "test") + changeset = create(:changeset, :closed) - assert_difference('changeset.subscribers.count') do + assert_difference "changeset.subscribers.count", 1 do post :subscribe, :id => changeset.id end assert_response :success @@ -1927,31 +2232,34 @@ EOF ## # test subscribe fail def test_subscribe_fail + user = create(:user) + # unauthorized - changeset = changesets(:normal_user_closed_change) - assert_no_difference('changeset.subscribers.count') do + changeset = create(:changeset, :closed) + assert_no_difference "changeset.subscribers.count" do post :subscribe, :id => changeset.id end assert_response :unauthorized - basic_authorization(users(:public_user).email, 'test') + basic_authorization(user.email, "test") # bad changeset id - assert_no_difference('changeset.subscribers.count') do + assert_no_difference "changeset.subscribers.count" do post :subscribe, :id => 999111 end assert_response :not_found # not closed changeset - changeset = changesets(:normal_user_first_change) - assert_no_difference('changeset.subscribers.count') do + changeset = create(:changeset) + assert_no_difference "changeset.subscribers.count" do post :subscribe, :id => changeset.id end assert_response :conflict # trying to subscribe when already subscribed - changeset = changesets(:normal_user_subscribed_change) - assert_no_difference('changeset.subscribers.count') do + changeset = create(:changeset, :closed) + changeset.subscribers.push(user) + assert_no_difference "changeset.subscribers.count" do post :subscribe, :id => changeset.id end assert_response :conflict @@ -1960,10 +2268,12 @@ EOF ## # test unsubscribe success def test_unsubscribe_success - basic_authorization(users(:public_user).email, 'test') - changeset = changesets(:normal_user_subscribed_change) + user = create(:user) + basic_authorization(user.email, "test") + changeset = create(:changeset, :closed) + changeset.subscribers.push(user) - assert_difference('changeset.subscribers.count', -1) do + assert_difference "changeset.subscribers.count", -1 do post :unsubscribe, :id => changeset.id end assert_response :success @@ -1973,30 +2283,30 @@ EOF # test unsubscribe fail def test_unsubscribe_fail # unauthorized - changeset = changesets(:normal_user_closed_change) - assert_no_difference('changeset.subscribers.count') do + changeset = create(:changeset, :closed) + assert_no_difference "changeset.subscribers.count" do post :unsubscribe, :id => changeset.id end assert_response :unauthorized - basic_authorization(users(:public_user).email, 'test') + basic_authorization(create(:user).email, "test") # bad changeset id - assert_no_difference('changeset.subscribers.count', -1) do + assert_no_difference "changeset.subscribers.count" do post :unsubscribe, :id => 999111 end assert_response :not_found # not closed changeset - changeset = changesets(:normal_user_first_change) - assert_no_difference('changeset.subscribers.count', -1) do + changeset = create(:changeset) + assert_no_difference "changeset.subscribers.count" do post :unsubscribe, :id => changeset.id end assert_response :conflict # trying to unsubscribe when not subscribed - changeset = changesets(:normal_user_closed_change) - assert_no_difference('changeset.subscribers.count') do + changeset = create(:changeset, :closed) + assert_no_difference "changeset.subscribers.count" do post :unsubscribe, :id => changeset.id end assert_response :not_found @@ -2006,81 +2316,86 @@ EOF # test hide comment fail def test_hide_comment_fail # unauthorized - comment = changeset_comments(:normal_comment_1) - assert('comment.visible') do - post :hide_comment, :id => comment.id - assert_response :unauthorized - end + comment = create(:changeset_comment) + assert_equal true, comment.visible - basic_authorization(users(:public_user).email, 'test') + post :hide_comment, :id => comment.id + assert_response :unauthorized + assert_equal true, comment.reload.visible + + basic_authorization(create(:user).email, "test") # not a moderator - assert('comment.visible') do - post :hide_comment, :id => comment.id - assert_response :forbidden - end + post :hide_comment, :id => comment.id + assert_response :forbidden + assert_equal true, comment.reload.visible - basic_authorization(users(:moderator_user).email, 'test') + basic_authorization(create(:moderator_user).email, "test") # bad comment id post :hide_comment, :id => 999111 assert_response :not_found + assert_equal true, comment.reload.visible end ## # test hide comment succes def test_hide_comment_success - comment = changeset_comments(:normal_comment_1) + comment = create(:changeset_comment) + assert_equal true, comment.visible - basic_authorization(users(:moderator_user).email, 'test') + basic_authorization(create(:moderator_user).email, "test") - assert('!comment.visible') do - post :hide_comment, :id => comment.id - end + post :hide_comment, :id => comment.id assert_response :success + assert_equal false, comment.reload.visible end ## # test unhide comment fail def test_unhide_comment_fail # unauthorized - comment = changeset_comments(:normal_comment_1) - assert('comment.visible') do - post :unhide_comment, :id => comment.id - assert_response :unauthorized - end + comment = create(:changeset_comment, :visible => false) + assert_equal false, comment.visible - basic_authorization(users(:public_user).email, 'test') + post :unhide_comment, :id => comment.id + assert_response :unauthorized + assert_equal false, comment.reload.visible + + basic_authorization(create(:user).email, "test") # not a moderator - assert('comment.visible') do - post :unhide_comment, :id => comment.id - assert_response :forbidden - end + post :unhide_comment, :id => comment.id + assert_response :forbidden + assert_equal false, comment.reload.visible - basic_authorization(users(:moderator_user).email, 'test') + basic_authorization(create(:moderator_user).email, "test") # bad comment id post :unhide_comment, :id => 999111 assert_response :not_found + assert_equal false, comment.reload.visible end ## # test unhide comment succes def test_unhide_comment_success - comment = changeset_comments(:normal_comment_1) + comment = create(:changeset_comment, :visible => false) + assert_equal false, comment.visible - basic_authorization(users(:moderator_user).email, 'test') + basic_authorization(create(:moderator_user).email, "test") - assert('!comment.visible') do - post :unhide_comment, :id => comment.id - end + post :unhide_comment, :id => comment.id assert_response :success + assert_equal true, comment.reload.visible end ## # test comments feed def test_comments_feed + changeset = create(:changeset, :closed) + create_list(:changeset_comment, 3, :changeset => changeset) + get :comments_feed, :format => "rss" assert_response :success assert_equal "application/rss+xml", @response.content_type @@ -2090,7 +2405,16 @@ EOF end end - get :comments_feed, :id => changesets(:normal_user_closed_change), :format => "rss" + get :comments_feed, :format => "rss", :limit => 2 + assert_response :success + assert_equal "application/rss+xml", @response.content_type + assert_select "rss", :count => 1 do + assert_select "channel", :count => 1 do + assert_select "item", :count => 2 + end + end + + get :comments_feed, :id => changeset.id, :format => "rss" assert_response :success assert_equal "application/rss+xml", @response.content_type assert_select "rss", :count => 1 do @@ -2100,9 +2424,17 @@ EOF end end - #------------------------------------------------------------ - # utility functions - #------------------------------------------------------------ + ## + # test comments feed + def test_comments_feed_bad_limit + get :comments_feed, :format => "rss", :limit => 0 + assert_response :bad_request + + get :comments_feed, :format => "rss", :limit => 100001 + assert_response :bad_request + end + + private ## # boilerplate for checking that certain changesets exist in the @@ -2128,16 +2460,16 @@ EOF # check the bbox doc = XML::Parser.string(@response.body).parse changeset = doc.find("//osm/changeset").first - assert_equal bbox[0], changeset['min_lon'].to_f, "min lon" - assert_equal bbox[1], changeset['min_lat'].to_f, "min lat" - assert_equal bbox[2], changeset['max_lon'].to_f, "max lon" - assert_equal bbox[3], changeset['max_lat'].to_f, "max lat" + assert_equal bbox[0], changeset["min_lon"].to_f, "min lon" + assert_equal bbox[1], changeset["min_lat"].to_f, "min lat" + assert_equal bbox[2], changeset["max_lon"].to_f, "max lon" + assert_equal bbox[3], changeset["max_lat"].to_f, "max lat" end ## # update the changeset_id of a way element def update_changeset(xml, changeset_id) - xml_attr_rewrite(xml, 'changeset', changeset_id) + xml_attr_rewrite(xml, "changeset", changeset_id) end ## @@ -2146,4 +2478,36 @@ EOF xml.find("//osm/way").first[name] = value.to_s xml end + + ## + # check the result of a list + def check_list_result(changesets) + changesets = changesets.where("num_changes > 0") + .order(:created_at => :desc) + .limit(20) + assert changesets.size <= 20 + + assert_select "ol.changesets", :count => [changesets.size, 1].min do + assert_select "li", :count => changesets.size + + changesets.each do |changeset| + assert_select "li#changeset_#{changeset.id}", :count => 1 + end + end + end + + ## + # check the result of a feed + def check_feed_result(changesets) + assert changesets.size <= 20 + + assert_select "feed", :count => [changesets.size, 1].min do + assert_select "> title", :count => 1, :text => /^Changesets/ + assert_select "> entry", :count => changesets.size + + changesets.each do |changeset| + assert_select "> entry > id", changeset_url(:id => changeset.id) + end + end + end end