X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c84a371d9736c5deae97e9617024f1501e57a58f..c77429000c55af95056572206a99774711c8d22b:/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 ca2ff8e15..2886780a0 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 @@ -65,7 +63,7 @@ class ChangesetControllerTest < ActionController::TestCase ) assert_routing( { :path => "/user/name/history", :method => :get }, - { :controller => "changeset", :action => "list", :display_name => "name" } + { :controller => "changeset", :action => "index", :display_name => "name" } ) assert_routing( { :path => "/user/name/history/feed", :method => :get }, @@ -73,15 +71,15 @@ class ChangesetControllerTest < ActionController::TestCase ) assert_routing( { :path => "/history/friends", :method => :get }, - { :controller => "changeset", :action => "list", :friends => true, :format => :html } + { :controller => "changeset", :action => "index", :friends => true, :format => :html } ) assert_routing( { :path => "/history/nearby", :method => :get }, - { :controller => "changeset", :action => "list", :nearby => true, :format => :html } + { :controller => "changeset", :action => "index", :nearby => true, :format => :html } ) assert_routing( { :path => "/history", :method => :get }, - { :controller => "changeset", :action => "list" } + { :controller => "changeset", :action => "index" } ) assert_routing( { :path => "/history/feed", :method => :get }, @@ -98,18 +96,18 @@ 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 "" + - "" + + 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 "" + - "" + + content "" \ + "" \ "" put :create @@ -133,13 +131,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" @@ -150,24 +148,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 @@ -178,16 +176,16 @@ 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 + 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 @@ -195,10 +193,10 @@ class ChangesetControllerTest < ActionController::TestCase assert_select "osm>changeset>discussion", 1 assert_select "osm>changeset>discussion>comment", 0 - changeset_id = changesets(:normal_user_closed_change).id + 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,10 +210,10 @@ 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 + assert_match(/No route matches/, ex.to_s) end end end @@ -223,34 +221,42 @@ 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, :params => { :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, :params => { :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 - put :close, :id => cs_id + cs_id = changeset.id + put :close, :params => { :id => cs_id } assert_response :success # test that it really is closed now cs = Changeset.find(cs_id) - assert(!cs.is_open?, - "changeset should be closed now (#{cs.closed_at} > #{Time.now.getutc}.") + assert_not(cs.is_open?, + "changeset should be closed now (#{cs.closed_at} > #{Time.now.getutc}.") end ## # 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, :params => { :id => changeset.id } assert_response :conflict assert_equal "The user doesn't own that changeset", @response.body end @@ -258,13 +264,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, :params => { :id => changeset.id } assert_response :method_not_allowed - post :close, :id => cs_id + post :close, :params => { :id => changeset.id } assert_response :method_not_allowed end @@ -276,21 +284,21 @@ 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 + assert_match(/No route matches/, ex.to_s) end 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 + 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 + assert_match(/No route matches/, ex.to_s) end end end @@ -300,132 +308,151 @@ 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 = < - - - - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + + + + +CHANGESET # upload it content diff - post :upload, :id => changeset_id + post :upload, :params => { :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 = < - - - - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + + + + +CHANGESET # 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}" ## 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 = < - - - - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + + + + +CHANGESET # 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}" # 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 = < - - - - - - - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + + + + + + + +CHANGESET # upload it content diff - post :upload, :id => cs_id + post :upload, :params => { :id => changeset.id } assert_response :success, "can't upload a simple valid creation to changeset: #{@response.body}" @@ -442,9 +469,9 @@ EOF new_rel_id = doc.find("//diffResult/relation").first["new_id"].to_i # check the old IDs are all present and negative one - assert_equal -1, doc.find("//diffResult/node").first["old_id"].to_i - assert_equal -1, doc.find("//diffResult/way").first["old_id"].to_i - assert_equal -1, doc.find("//diffResult/relation").first["old_id"].to_i + assert_equal(-1, doc.find("//diffResult/node").first["old_id"].to_i) + assert_equal(-1, doc.find("//diffResult/way").first["old_id"].to_i) + assert_equal(-1, doc.find("//diffResult/relation").first["old_id"].to_i) # check the versions are present and equal one assert_equal 1, doc.find("//diffResult/node").first["new_version"].to_i @@ -461,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 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| + %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}" @@ -492,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 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, :params => { :id => changeset.id } assert_response :success, "can't upload a deletion diff to changeset: #{@response.body}" @@ -522,12 +557,12 @@ EOF end def test_repeated_changeset_create - 30.times do - basic_authorization users(:public_user).email, "test" + 3.times do + basic_authorization create(:user).email, "test" # create a temporary changeset - content "" + - "" + + content "" \ + "" \ "" assert_difference "Changeset.count", 1 do put :create @@ -537,7 +572,7 @@ EOF end def test_upload_large_changeset - basic_authorization users(:public_user).email, "test" + basic_authorization create(:user).email, "test" # create a changeset content "" @@ -545,37 +580,36 @@ EOF assert_response :success, "Should be able to create a changeset: #{@response.body}" changeset_id = @response.body.to_i - # upload some widely-spaced nodes, spiralling positive and negative to cause - # largest bbox over-expansion possible. - diff = < - - - - - - - - - - - - - - - - - - - - - -EOF + # upload some widely-spaced nodes, spiralling positive and negative + diff = < + + + + + + + + + + + + + + + + + + + + + +CHANGESET # 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}" @@ -584,53 +618,85 @@ EOF 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_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, :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 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, :params => { :id => changeset.id } assert_response :success, "can't do a conditional delete of in use objects: #{@response.body}" @@ -644,46 +710,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 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 = < - - - - - - -EOF + diff = < + + + + + + +CHANGESET # 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 @@ -692,35 +759,41 @@ 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 = < - - - - - - - - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + + + + + + + + +CHANGESET # 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}" @@ -736,11 +809,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, id, "relation should contain new node" - end + 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| + assert_equal new_node_id, id, "relation should contain new node" if type == "node" end end @@ -748,77 +819,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 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) + diff = < + + + + + + + + + + + + + + + + + + + + +CHANGESET # 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 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 # sequential? - diff = < - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + +CHANGESET # 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}" @@ -832,21 +906,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 - - diff = < - - - - - -EOF + node = create(:node) + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + +CHANGESET # 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 @@ -854,20 +930,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 + diff = < + + + + +CHANGESET # 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 @@ -875,18 +952,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 - - diff = < - - - - -EOF + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + +CHANGESET 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 @@ -895,26 +973,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 - - diff = < - - - - - - - -EOF + 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 = < + + + + + + + +CHANGESET # 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}" @@ -923,36 +1007,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 - - diff = < - - - - - - - - - - - - -EOF + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + + + + + + + +CHANGESET # 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}" @@ -965,22 +1049,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 - - diff = < - - - - - - -EOF + changeset = create(:changeset) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + +CHANGESET # 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 @@ -989,126 +1074,130 @@ 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 - - diff = < - - - - - - - - - - - - -EOF + changeset = create(:changeset) + way = create(:way) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + + + + + + + +CHANGESET # 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 = < - - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + + +CHANGESET # 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 users(:public_user).email, "test" - changeset_id = changesets(:public_user_first_change).id - - diff = < - - - - - - - - - - - - -EOF + changeset = create(:changeset) + relation = create(:relation) + + basic_authorization changeset.user.email, "test" + + diff = < + + + + + + + + + + + + +CHANGESET # 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 = < - - - - - - - - - - - - -EOF + # the same again, but this time use an existing relation + diff = < + + + + + + + + + + + + +CHANGESET # 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 ## # 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 "" + - "" + + 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" @@ -1122,7 +1211,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" @@ -1137,23 +1226,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 "" + - "" + + 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 @@ -1161,7 +1251,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" @@ -1176,7 +1266,9 @@ 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" ["", "", @@ -1184,8 +1276,8 @@ EOF ""].each do |diff| # upload it content diff - post :upload, :id => changesets(:public_user_first_change).id - assert_response(:success, "should be able to upload " + + post :upload, :params => { :id => changeset.id } + assert_response(:success, "should be able to upload " \ "empty changeset: " + diff) end end @@ -1193,19 +1285,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, :params => { :id => changeset.id } assert_response :success, "failed to return error in XML format" @@ -1219,50 +1315,52 @@ 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 "" + - "" + + 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 "" + - "" + + content "" \ + "" \ "" put :create assert_response :success changeset_id = @response.body.to_i # add a diff to it - diff = < - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + +CHANGESET # 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 @@ -1276,52 +1374,52 @@ 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 "" + - "" + + content "" \ + "" \ "" put :create 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 @@ -1335,46 +1433,49 @@ 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 "" + - "" + + content "" \ + "" \ "" put :create assert_response :success changeset_id = @response.body.to_i # add a diff to it - diff = < - - - - - - - - - - - - - - - - - - -EOF + diff = < + + + + + + + + + + + + + + + + + + +CHANGESET # 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 @@ -1388,9 +1489,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 @@ -1398,10 +1505,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 @@ -1409,7 +1516,10 @@ 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 - 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 "" @@ -1425,12 +1535,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 @@ -1440,35 +1550,33 @@ 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.0000000']", 1 + assert_select "osm>changeset[min_lat='1.0000000']", 1 + assert_select "osm>changeset[max_lat='3.0000000']", 1 end ## # 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 "" @@ -1490,7 +1598,7 @@ EOF ## # 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 "" @@ -1503,94 +1611,104 @@ 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 ## # test the query functionality of changesets def test_query - get :query, :bbox => "-10,-10, 10, 10" + 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)) + 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, :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 => users(:normal_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 => users(:normal_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 "test@openstreetmap.org", "test" - get :query, :user => users(:normal_user).id + basic_authorization private_user.email, "test" + get :query, :params => { :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, private_user_closed_changeset] - get :query, :display_name => users(:normal_user).display_name + get :query, :params => { :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, private_user_closed_changeset] # 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, :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 => users(:normal_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 [1] + 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] + 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] + assert_changesets [private_user_changeset, private_user_closed_changeset, changeset, closed_changeset, changeset2, changeset3] - get :query, :time => "2007-12-31T23:59Z,2008-01-01T00: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] + 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] + 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] + assert_changesets [private_user_closed_changeset, closed_changeset] - get :query, :closed => "true", :user => users(:normal_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 [3, 6, 8] + assert_changesets [private_user_closed_changeset] - get :query, :closed => "true", :user => users(:public_user).id + get :query, :params => { :closed => "true", :user => user.id } assert_response :success, "can't get changesets by closed-ness and user" - assert_changesets [7] + assert_changesets [closed_changeset] - get :query, :changesets => "1,2,3" + 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 [1, 2, 3] + 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 @@ -1601,7 +1719,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 @@ -1610,7 +1728,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 @@ -1618,7 +1736,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 @@ -1626,9 +1744,13 @@ 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" @@ -1636,21 +1758,20 @@ EOF content new_changeset # try without any authorization - put :update, :id => changeset.id + put :update, :params => { :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, :params => { :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, :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 - changeset = changesets(:public_user_first_change) create(:changeset_tag, :changeset => changeset) new_changeset = changeset.to_xml new_tag = XML::Node.new "tag" @@ -1661,17 +1782,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 users(:second_public_user).email, "test" - put :update, :id => changeset.id + basic_authorization create(:user).email, "test" + put :update, :params => { :id => changeset.id } assert_response :conflict # now this should work... - basic_authorization users(:public_user).email, "test" - put :update, :id => changeset.id + basic_authorization user.email, "test" + put :update, :params => { :id => changeset.id } assert_response :success assert_select "osm>changeset[id='#{changeset.id}']", 1 @@ -1683,9 +1804,9 @@ 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" @@ -1693,7 +1814,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 @@ -1701,7 +1822,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 "" @@ -1724,7 +1845,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 @@ -1736,7 +1857,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 @@ -1746,7 +1867,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 @@ -1754,209 +1875,247 @@ EOF assert_equal Changeset::MAX_ELEMENTS + 1, changeset.num_changes # check that the changeset is now closed as well - assert(!changeset.is_open?, - "changeset should have been auto-closed by exceeding " + - "element limit.") + assert_not(changeset.is_open?, + "changeset should have been auto-closed by exceeding " \ + "element limit.") end ## # This should display the last 20 changesets closed - def test_list - get :list, :format => "html" + def test_index + get :index, :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 :index, :params => { :format => "html", :list => "1" }, :xhr => true assert_response :success - assert_template "list" + assert_template "index" - check_list_result(Changeset.all) + check_index_result(Changeset.all) end ## # This should display the last 20 changesets closed - def test_list_xhr - xhr :get, :list, :format => "html" + def test_index_xhr + get :index, :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 :index, :params => { :format => "html", :list => "1" }, :xhr => true assert_response :success - assert_template "list" + assert_template "index" - check_list_result(Changeset.all) + check_index_result(Changeset.all) 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" + def test_index_bbox + get :index, :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 :index, :params => { :format => "html", :bbox => "4.5,4.5,5.5,5.5", :list => "1" }, :xhr => true assert_response :success - assert_template "list" + assert_template "index" - check_list_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000")) + check_index_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) + def test_index_user + user = create(:user) + create(:changeset, :user => user) + create(:changeset, :closed, :user => user) - get :list, :format => "html", :display_name => user.display_name + get :index, :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 :index, :params => { :format => "html", :display_name => user.display_name, :list => "1" }, :xhr => true assert_response :success - assert_template "list" + assert_template "index" - check_list_result(user.changesets) + check_index_result(user.changesets) end ## # Checks the display of the user changesets listing for a private user - def test_list_private_user - user = users(:normal_user) + def test_index_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 => user.display_name + get :index, :params => { :format => "html", :display_name => private_user.display_name } assert_response :success assert_template "history" - xhr :get, :list, :format => "html", :display_name => user.display_name, :list => "1" + get :index, :params => { :format => "html", :display_name => private_user.display_name, :list => "1" }, :xhr => true assert_response :success - assert_template "list" + assert_template "index" - check_list_result(Changeset.none) + check_index_result(Changeset.none) end ## - # Check the not found of the list user changesets - def test_list_user_not_found - get :list, :format => "html", :display_name => "Some random user" + # Check the not found of the index user changesets + def test_index_user_not_found + get :index, :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 :index, :params => { :format => "html", :display_name => "Some random user", :list => "1" }, :xhr => true assert_response :not_found assert_template "user/no_such_user" end ## # Checks the display of the friends changesets listing - def test_list_friends - user = users(:normal_user) + def test_index_friends + private_user = create(:user, :data_public => true) + friend = create(:friend, :befriender => private_user) + create(:changeset, :user => friend.befriendee) - get :list, :friends => true + get :index, :params => { :friends => true } assert_response :redirect assert_redirected_to :controller => :user, :action => :login, :referer => friend_changesets_path - session[:user] = user.id + session[:user] = private_user.id - get :list, :friends => true + get :index, :params => { :friends => true } assert_response :success assert_template "history" - xhr :get, :list, :friends => true, :list => "1" + get :index, :params => { :friends => true, :list => "1" }, :xhr => true assert_response :success - assert_template "list" + assert_template "index" - check_list_result(Changeset.where(:user => user.friend_users.identifiable)) + check_index_result(Changeset.where(:user => private_user.friend_users.identifiable)) end ## # Checks the display of the nearby user changesets listing - def test_list_nearby - user = users(:normal_user) + def test_index_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 + get :index, :params => { :nearby => true } assert_response :redirect assert_redirected_to :controller => :user, :action => :login, :referer => nearby_changesets_path - session[:user] = user.id + session[:user] = private_user.id - get :list, :nearby => true + get :index, :params => { :nearby => true } assert_response :success assert_template "history" - xhr :get, :list, :nearby => true, :list => "1" + get :index, :params => { :nearby => true, :list => "1" }, :xhr => true assert_response :success - assert_template "list" + assert_template "index" - check_list_result(Changeset.where(:user => user.nearby)) + check_index_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 + # Check that we can't request later pages of the changesets index + def test_index_max_id + get :index, :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 :index, :params => { :format => "html", :list => "1", :max_id => 4 }, :xhr => true assert_response :success - assert_template "list" + assert_template "index" - check_list_result(Changeset.where("id <= 4")) + check_index_result(Changeset.where("id <= 4")) end ## - # This should display the last 20 changesets closed + # Check that a list with a next page link works + def test_index_more + create_list(:changeset, 50) + + get :index, :params => { :format => "html" } + assert_response :success + + get :index, :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) + create(:changeset_tag, :changeset => changeset) + create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/") + 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_template "index" 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) + create(:changeset_tag, :changeset => changeset) + create(:changeset_tag, :changeset => changeset, :k => "website", :v => "http://example.com/") + 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_template "index" 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 = users(:public_user) + user = create(:user) + changesets = create_list(:changeset, 3, :user => user, :num_changes => 4) + create(:changeset_tag, :changeset => changesets[1]) + create(:changeset_tag, :changeset => changesets[1], :k => "website", :v => "http://example.com/") + _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_template "index" 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 @@ -1965,68 +2124,78 @@ EOF # 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, :params => { :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 => changesets(:normal_user_closed_change).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 - changeset = changesets(:normal_user_subscribed_change) - changeset.subscribers.push(users(:normal_user)) - changeset.subscribers.push(users(:public_user)) - changeset.subscribers.push(users(:suspended_user)) - changeset.subscribers.push(users(:deleted_user)) + 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" + post :comment, :params => { :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] test2 has commented on one of your changesets", email.subject - assert_equal "test@openstreetmap.org", email.to.first + 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(users(:second_public_user).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 - email = ActionMailer::Base.deliveries.find { |e| e.to.first == "test@openstreetmap.org" } + 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] pulibc_test2 has commented on one of your changesets", email.subject + assert_equal "[OpenStreetMap] #{user2.display_name} has commented on one of your changesets", email.subject - email = ActionMailer::Base.deliveries.find { |e| e.to.first == "test@example.com" } + email = ActionMailer::Base.deliveries.find { |e| e.to.first == user.email } assert_not_nil email assert_equal 1, email.to.length - assert_equal "[OpenStreetMap] pulibc_test2 has commented on a changeset you are interested in", email.subject + assert_equal "[OpenStreetMap] #{user2.display_name} has commented on a changeset you are interested in", email.subject ActionMailer::Base.deliveries.clear end @@ -2035,32 +2204,32 @@ EOF # 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, :params => { :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" + 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 => changesets(:normal_user_first_change).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 => changesets(:normal_user_closed_change).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 => changesets(:normal_user_closed_change).id, :text => "" + post :comment, :params => { :id => create(:changeset, :closed).id, :text => "" } end assert_response :bad_request end @@ -2068,11 +2237,18 @@ 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", 1 do + post :subscribe, :params => { :id => changeset.id } + end + assert_response :success + # not closed changeset + changeset = create(:changeset) assert_difference "changeset.subscribers.count", 1 do - post :subscribe, :id => changeset.id + post :subscribe, :params => { :id => changeset.id } end assert_response :success end @@ -2080,33 +2256,28 @@ EOF ## # test subscribe fail def test_subscribe_fail + user = create(:user) + # unauthorized - changeset = changesets(:normal_user_closed_change) + 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(users(:public_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 = changesets(:normal_user_first_change) - 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) - changeset.subscribers.push(users(:public_user)) + 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 @@ -2114,12 +2285,22 @@ EOF ## # test unsubscribe success def test_unsubscribe_success - basic_authorization(users(:public_user).email, "test") - changeset = changesets(:normal_user_subscribed_change) - changeset.subscribers.push(users(:public_user)) + user = create(:user) + 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 + + # not closed changeset + changeset = create(:changeset) + changeset.subscribers.push(user) + + assert_difference "changeset.subscribers.count", -1 do + post :unsubscribe, :params => { :id => changeset.id } end assert_response :success end @@ -2128,31 +2309,24 @@ EOF # test unsubscribe fail def test_unsubscribe_fail # unauthorized - changeset = changesets(:normal_user_closed_change) + 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(users(:public_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 = changesets(:normal_user_first_change) - 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) + 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 @@ -2164,21 +2338,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(users(:public_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(users(: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 @@ -2189,9 +2363,9 @@ EOF comment = create(:changeset_comment) assert_equal true, comment.visible - basic_authorization(users(: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 @@ -2203,21 +2377,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(users(:public_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(users(: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 @@ -2228,9 +2402,9 @@ EOF 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" - post :unhide_comment, :id => comment.id + post :unhide_comment, :params => { :id => comment.id } assert_response :success assert_equal true, comment.reload.visible end @@ -2238,9 +2412,10 @@ EOF ## # test comments feed def test_comments_feed - create_list(:changeset_comment, 3, :changeset_id => changesets(:normal_user_closed_change).id) + 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 @@ -2249,7 +2424,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 @@ -2258,7 +2433,7 @@ EOF end end - get :comments_feed, :id => changesets(:normal_user_closed_change), :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 @@ -2271,10 +2446,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 @@ -2283,10 +2458,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 @@ -2294,7 +2469,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 @@ -2324,8 +2499,8 @@ EOF end ## - # check the result of a list - def check_list_result(changesets) + # check the result of a index + def check_index_result(changesets) changesets = changesets.where("num_changes > 0") .order(:created_at => :desc) .limit(20) @@ -2343,9 +2518,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