X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/20a861392e1ee7970da5d95b546aa8551faaf27b..2d5df687fcbf2564e2f199535aed04f67953bd0e:/test/functional/changeset_controller_test.rb
diff --git a/test/functional/changeset_controller_test.rb b/test/functional/changeset_controller_test.rb
index a840dd233..9ed9f2959 100644
--- a/test/functional/changeset_controller_test.rb
+++ b/test/functional/changeset_controller_test.rb
@@ -4,6 +4,79 @@ require 'changeset_controller'
class ChangesetControllerTest < ActionController::TestCase
api_fixtures
+ ##
+ # test all routes which lead to this controller
+ def test_routes
+ assert_routing(
+ { :path => "/api/0.6/changeset/create", :method => :put },
+ { :controller => "changeset", :action => "create" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/changeset/1/upload", :method => :post },
+ { :controller => "changeset", :action => "upload", :id => "1" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/changeset/1/download", :method => :get },
+ { :controller => "changeset", :action => "download", :id => "1" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/changeset/1/expand_bbox", :method => :post },
+ { :controller => "changeset", :action => "expand_bbox", :id => "1" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/changeset/1", :method => :get },
+ { :controller => "changeset", :action => "read", :id => "1" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/changeset/1", :method => :put },
+ { :controller => "changeset", :action => "update", :id => "1" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/changeset/1/close", :method => :put },
+ { :controller => "changeset", :action => "close", :id => "1" }
+ )
+ assert_routing(
+ { :path => "/api/0.6/changesets", :method => :get },
+ { :controller => "changeset", :action => "query" }
+ )
+ assert_routing(
+ { :path => "/user/name/edits", :method => :get },
+ { :controller => "changeset", :action => "list", :display_name => "name" }
+ )
+ assert_routing(
+ { :path => "/user/name/edits/feed", :method => :get },
+ { :controller => "changeset", :action => "feed", :display_name => "name", :format => :atom }
+ )
+ assert_routing(
+ { :path => "/browse/friends", :method => :get },
+ { :controller => "changeset", :action => "list", :friends => true }
+ )
+ assert_routing(
+ { :path => "/browse/nearby", :method => :get },
+ { :controller => "changeset", :action => "list", :nearby => true }
+ )
+ assert_routing(
+ { :path => "/browse/changesets", :method => :get },
+ { :controller => "changeset", :action => "list" }
+ )
+ assert_routing(
+ { :path => "/browse/changesets/feed", :method => :get },
+ { :controller => "changeset", :action => "feed", :format => :atom }
+ )
+ assert_recognizes(
+ { :controller => "changeset", :action => "list" },
+ { :path => "/browse", :method => :get }
+ )
+ assert_recognizes(
+ { :controller => "changeset", :action => "list" },
+ { :path => "/history", :method => :get }
+ )
+ assert_recognizes(
+ { :controller => "changeset", :action => "feed", :format => :atom },
+ { :path => "/history/feed", :method => :get }
+ )
+ end
+
# -----------------------
# Test simple changeset creation
# -----------------------
@@ -99,8 +172,12 @@ class ChangesetControllerTest < ActionController::TestCase
# check that a changeset that doesn't exist returns an appropriate message
def test_read_not_found
[0, -32, 233455644, "afg", "213"].each do |id|
- get :read, :id => id
- assert_response :not_found, "should get a not found"
+ begin
+ get :read, :id => id
+ assert_response :not_found, "should get a not found"
+ rescue ActionController::RoutingError => ex
+ assert_match /No route matches/, ex.to_s
+ end
end
end
@@ -161,15 +238,23 @@ class ChangesetControllerTest < ActionController::TestCase
# First try to do it with no auth
cs_ids.each do |id|
- put :close, :id => id
- assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized"
+ begin
+ put :close, :id => id
+ assert_response :unauthorized, "Shouldn't be able close the non-existant changeset #{id}, when not authorized"
+ rescue ActionController::RoutingError => ex
+ assert_match /No route matches/, ex.to_s
+ end
end
# Now try with auth
basic_authorization users(:public_user).email, "test"
cs_ids.each do |id|
- put :close, :id => id
- assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed"
+ begin
+ put :close, :id => id
+ assert_response :not_found, "The changeset #{id} doesn't exist, so can't be closed"
+ rescue ActionController::RoutingError => ex
+ assert_match /No route matches/, ex.to_s
+ end
end
end
@@ -419,6 +504,57 @@ EOF
end
end
+ def test_upload_large_changeset
+ basic_authorization users(:public_user).email, "test"
+
+ # create a changeset
+ content ""
+ put :create
+ 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 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
+ assert_response :success,
+ "can't upload a spatially-large diff to changeset: #{@response.body}"
+
+ # check that the changeset bbox is within bounds
+ cs = Changeset.find(changeset_id)
+ assert cs.min_lon >= -180 * SCALE, "Minimum longitude (#{cs.min_lon / SCALE}) should be >= -180 to be valid."
+ assert cs.max_lon <= 180 * SCALE, "Maximum longitude (#{cs.max_lon / SCALE}) should be <= 180 to be valid."
+ assert cs.min_lat >= -90 * SCALE, "Minimum latitude (#{cs.min_lat / SCALE}) should be >= -90 to be valid."
+ assert cs.max_lat >= 90 * SCALE, "Maximum latitude (#{cs.max_lat / 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.
@@ -438,7 +574,7 @@ EOF
post :upload, :id => 2
assert_response :precondition_failed,
"shouldn't be able to upload a invalid deletion diff: #{@response.body}"
- assert_equal "Precondition failed: Way 3 still used by relation 1.", @response.body
+ assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body
# check that nothing was, in fact, deleted
assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible
@@ -446,6 +582,56 @@ EOF
assert_equal true, Relation.find(current_relations(:visible_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"
+
+ 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
+
+ # upload it
+ content diff
+ post :upload, :id => 2
+ assert_response :success,
+ "can't do a conditional delete of in use objects: #{@response.body}"
+
+ # check the returned payload
+ assert_select "diffResult[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+ assert_select "diffResult>node", 1
+ assert_select "diffresult>way", 1
+ assert_select "diffResult>relation", 1
+
+ # parse the response
+ 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
+
+ # 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
+
+ # 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
+
+ # 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
+ end
+
##
# upload an element with a really long tag value
def test_upload_invalid_too_long_tag
@@ -973,6 +1159,32 @@ EOF
end
end
+ ##
+ # test that the X-Error-Format header works to request XML errors
+ def test_upload_xml_errors
+ basic_authorization users(:public_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
+
+ # upload it
+ content diff
+ error_format "xml"
+ post :upload, :id => 2
+ assert_response :success,
+ "failed to return error in XML format"
+
+ # check the returned payload
+ assert_select "osmError[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+ assert_select "osmError>status", 1
+ assert_select "osmError>message", 1
+
+ end
+
##
# when we make some simple changes we get the same changes back from the
# diff download.
@@ -1155,10 +1367,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).id}][visible=#{nodes(:used_node_2).visible?}][version=#{nodes(:used_node_2).version}]" do
+ 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}]"
end
- assert_select "create>node[id=#{nodes(:visible_node).id}]"
+ assert_select "create>node[id=#{nodes(:visible_node).node_id}]"
end
end
@@ -1331,6 +1543,18 @@ EOF
get :query, :open => 'true'
assert_response :success, "can't get changesets by open-ness"
assert_changesets [1,2,4]
+
+ get :query, :closed => 'true'
+ assert_response :success, "can't get changesets by closed-ness"
+ assert_changesets [3,5,6,7]
+
+ get :query, :closed => 'true', :user => users(:normal_user).id
+ assert_response :success, "can't get changesets by closed-ness and user"
+ assert_changesets [3,6]
+
+ get :query, :closed => 'true', :user => users(:public_user).id
+ assert_response :success, "can't get changesets by closed-ness and user"
+ assert_changesets [7]
end
##
@@ -1504,14 +1728,14 @@ EOF
##
# This should display the last 20 changesets closed.
def test_list
- changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['min_lat IS NOT NULL'], :limit=> 20)
+ changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['num_changes > 0'], :limit=> 20)
assert changesets.size <= 20
get :list, {:format => "html"}
assert_response :success
assert_template "list"
# Now check that all 20 (or however many were returned) changesets are in the html
assert_select "h1", :text => "Changesets", :count => 1
- assert_select "table[id='changeset_list'] tr", :count => changesets.size + 1
+ assert_select "div[id='changeset_list'] ul", :count => changesets.size
changesets.each do |changeset|
# FIXME this test needs rewriting - test for table contents
end
@@ -1534,7 +1758,56 @@ EOF
assert_response :not_found
assert_template 'user/no_such_user'
end
+
+ ##
+ # This should display the last 20 changesets closed.
+ def test_feed
+ changesets = Changeset.find(:all, :order => "created_at DESC", :conditions => ['num_changes > 0'], :limit=> 20)
+ assert changesets.size <= 20
+ 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
+ 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}
+ assert_response :success
+ assert_template "changeset/_user"
+ ## FIXME need to add more checks to see which if edits are actually shown if your data is public
+ 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"}
+ assert_response :not_found
+ 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
+
+ get :download, :id => changeset_id
+ assert_response :success
+
+ assert_select "osmChange", 1
+ # this changeset contains node 17 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
+ end
+
#------------------------------------------------------------
# utility functions
#------------------------------------------------------------