class ChangesetControllerTest < ActionController::TestCase
api_fixtures
- def basic_authorization(user, pass)
- @request.env["HTTP_AUTHORIZATION"] = "Basic %s" % Base64.encode64("#{user}:#{pass}")
- end
-
- def content(c)
- @request.env["RAW_POST_DATA"] = c.to_s
- end
-
# -----------------------
# Test simple changeset creation
# -----------------------
def test_create
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:normal_user).email, "test"
+ # Create the first user's changeset
+ content "<osm><changeset>" +
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
+ put :create
+ assert_require_public_data
+
+ basic_authorization users(:public_user).email, "test"
# Create the first user's changeset
content "<osm><changeset>" +
"<tag k='created_by' v='osm test suite checking changesets'/>" +
assert_equal Rational(1,24), duration , "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
else
# must be number of seconds...
- assert_equal 3600.0, duration , "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
+ assert_equal 3600, duration.round, "initial idle timeout should be an hour (#{cs.created_at} -> #{cs.closed_at})"
end
end
def test_create_invalid
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:normal_user).email, "test"
+ content "<osm><changeset></osm>"
+ put :create
+ assert_require_public_data
+
+ ## Try the public user
+ basic_authorization users(:public_user).email, "test"
content "<osm><changeset></osm>"
put :create
assert_response :bad_request, "creating a invalid changeset should fail"
end
+ def test_create_invalid_no_content
+ ## First check with no auth
+ 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"
+ put :create
+ assert_require_public_data
+
+ ## Try the inactive user
+ basic_authorization users(:inactive_user).email, "test"
+ put :create
+ assert_inactive_user
+
+ ## Now try to use the public user
+ basic_authorization users(:public_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"
+ get :create
+ assert_response :method_not_allowed
+ post :create
+ assert_response :method_not_allowed
+ end
+
##
# check that the changeset can be read and returns the correct
# document structure.
assert_select "osm>changeset[id=#{changeset_id}]", 1
end
+ ##
+ # 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"
+ end
+ end
+
##
# test that the user who opened a change can close it
def test_close
- basic_authorization "test@openstreetmap.org", "test"
+ ## Try without authentication
+ put :close, :id => changesets(:public_user_first_change).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
+ assert_require_public_data
+
+
+ ## The try with the public user
+ basic_authorization users(:public_user).email, "test"
- cs_id = changesets(:normal_user_first_change).id
+ cs_id = changesets(:public_user_first_change).id
put :close, :id => cs_id
assert_response :success
##
# test that a different user can't close another user's changeset
def test_close_invalid
- basic_authorization "test@example.com", "test"
+ basic_authorization users(:public_user).email, "test"
put :close, :id => changesets(:normal_user_first_change).id
assert_response :conflict
assert_equal "The user doesn't own that changeset", @response.body
end
+
+ ##
+ # test that you can't close using another method
+ def test_close_method_invalid
+ basic_authorization users(:public_user).email, "test"
+
+ cs_id = changesets(:public_user_first_change).id
+ get :close, :id => cs_id
+ assert_response :method_not_allowed
+
+ post :close, :id => cs_id
+ assert_response :method_not_allowed
+ end
+
+ ##
+ # check that you can't close a changeset that isn't found
+ def test_close_not_found
+ cs_ids = [0, -132, "123"]
+
+ # 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"
+ 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"
+ end
+ end
##
# upload something simple, but valid and check that it can
- # be read back ok.
+ # be read back ok
+ # Also try without auth and another user.
def test_upload_simple_valid
- basic_authorization "test@openstreetmap.org", "test"
+ ## Try with no auth
+ changeset_id = changesets(:public_user_first_change).id
+
+ # simple diff to change a node, way and relation by removing
+ # their tags
+ diff = <<EOF
+<osmChange>
+ <modify>
+ <node id='1' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
+ <way id='1' changeset='#{changeset_id}' version='1'>
+ <nd ref='3'/>
+ </way>
+ </modify>
+ <modify>
+ <relation id='1' changeset='#{changeset_id}' version='1'>
+ <member type='way' role='some' ref='3'/>
+ <member type='node' role='some' ref='5'/>
+ <member type='relation' role='some' ref='3'/>
+ </relation>
+ </modify>
+</osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :unauthorized,
+ "shouldnn'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
+
+ # simple diff to change a node, way and relation by removing
+ # their tags
+ diff = <<EOF
+<osmChange>
+ <modify>
+ <node id='1' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
+ <way id='1' changeset='#{changeset_id}' version='1'>
+ <nd ref='3'/>
+ </way>
+ </modify>
+ <modify>
+ <relation id='1' changeset='#{changeset_id}' version='1'>
+ <member type='way' role='some' ref='3'/>
+ <member type='node' role='some' ref='5'/>
+ <member type='relation' role='some' ref='3'/>
+ </relation>
+ </modify>
+</osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :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
# simple diff to change a node, way and relation by removing
# their tags
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='0' lat='0' changeset='1' version='1'/>
- <way id='1' changeset='1' version='1'>
+ <node id='1' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
+ <way id='1' changeset='#{changeset_id}' version='1'>
<nd ref='3'/>
</way>
</modify>
<modify>
- <relation id='1' changeset='1' version='1'>
+ <relation id='1' changeset='#{changeset_id}' version='1'>
<member type='way' role='some' ref='3'/>
<member type='node' role='some' ref='5'/>
<member type='relation' role='some' ref='3'/>
# upload it
content diff
- post :upload, :id => 1
+ post :upload, :id => changeset_id
assert_response :success,
"can't upload a simple valid diff to changeset: #{@response.body}"
##
# upload something which creates new objects using placeholders
def test_upload_create_valid
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
+ cs_id = changesets(:public_user_first_change).id
# simple diff to create a node way and relation using placeholders
diff = <<EOF
<osmChange>
<create>
- <node id='-1' lon='0' lat='0' changeset='1'>
+ <node id='-1' lon='0' lat='0' changeset='#{cs_id}'>
<tag k='foo' v='bar'/>
<tag k='baz' v='bat'/>
</node>
- <way id='-1' changeset='1'>
+ <way id='-1' changeset='#{cs_id}'>
<nd ref='3'/>
</way>
</create>
<create>
- <relation id='-1' changeset='1'>
+ <relation id='-1' changeset='#{cs_id}'>
<member type='way' role='some' ref='3'/>
<member type='node' role='some' ref='5'/>
<member type='relation' role='some' ref='3'/>
# upload it
content diff
- post :upload, :id => 1
+ post :upload, :id => cs_id
assert_response :success,
"can't upload a simple valid creation to changeset: #{@response.body}"
# test a complex delete where we delete elements which rely on eachother
# in the same transaction.
def test_upload_delete
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).display_name, "test"
diff = XML::Document.new
diff.root = XML::Node.new "osmChange"
delete << current_ways(:used_way).to_xml_node
delete << current_nodes(:node_used_by_relationship).to_xml_node
+ # update the changeset to one that this user owns
+ changeset_id = changesets(:public_user_first_change).id
+ ["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 => 1
+ post :upload, :id => changeset_id
assert_response :success,
"can't upload a deletion diff to changeset: #{@response.body}"
+ # check the response is well-formed
+ assert_select "diffResult>node", 1
+ assert_select "diffResult>way", 1
+ 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(: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 = current_nodes(:public_visible_node)
+ cs = changesets(:public_user_first_change)
+ diff = "<osmChange><delete><node id='#{node.id}' version='#{node.version}' changeset='#{cs.id}'/></delete></osmChange>"
+
+ # upload it
+ content diff
+ post :upload, :id => cs.id
+ assert_response :success,
+ "can't upload a deletion diff to changeset: #{@response.body}"
+
+ # check the response is well-formed
+ assert_select "diffResult>node", 1
+
+ # check that everything was deleted
+ assert_equal false, Node.find(node.id).visible
+ end
+
+ def test_repeated_changeset_create
+ 30.times do
+ basic_authorization users(:public_user).email, "test"
+
+ # create a temporary changeset
+ content "<osm><changeset>" +
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
+ assert_difference('Changeset.count', 1) do
+ put :create
+ end
+ assert_response :success
+ changeset_id = @response.body.to_i
+ end
+ 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 "test@openstreetmap.org", "test"
+ 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 << current_relations(:visible_relation).to_xml_node
+ 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
# upload it
content diff
- post :upload, :id => 1
+ 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
# check that nothing was, in fact, deleted
assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible
# upload something which creates new objects and inserts them into
# existing containers using placeholders.
def test_upload_complex
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
+ cs_id = changesets(:public_user_first_change).id
# simple diff to create a node way and relation using placeholders
diff = <<EOF
<osmChange>
<create>
- <node id='-1' lon='0' lat='0' changeset='1'>
+ <node id='-1' lon='0' lat='0' changeset='#{cs_id}'>
<tag k='foo' v='bar'/>
<tag k='baz' v='bat'/>
</node>
</create>
<modify>
- <way id='1' changeset='1' version='1'>
+ <way id='1' changeset='#{cs_id}' version='1'>
<nd ref='-1'/>
<nd ref='3'/>
</way>
- <relation id='1' changeset='1' version='1'>
+ <relation id='1' changeset='#{cs_id}' version='1'>
<member type='way' role='some' ref='3'/>
<member type='node' role='some' ref='-1'/>
<member type='relation' role='some' ref='3'/>
# upload it
content diff
- post :upload, :id => 1
+ post :upload, :id => cs_id
assert_response :success,
"can't upload a complex diff to changeset: #{@response.body}"
# 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 "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
+ cs_id = changesets(:public_user_first_change).id
# simple diff to create a node way and relation using placeholders
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='0' lat='0' changeset='1' version='1'/>
- <way id='1' changeset='1' version='1'>
+ <node id='1' lon='0' lat='0' changeset='#{cs_id}' version='1'/>
+ <way id='1' changeset='#{cs_id}' version='1'>
<nd ref='3'/>
</way>
</modify>
<modify>
- <relation id='1' changeset='1' version='1'>
+ <relation id='1' changeset='#{cs_id}' version='1'>
<member type='way' role='some' ref='3'/>
<member type='node' role='some' ref='5'/>
<member type='relation' role='some' ref='3'/>
# upload it
content diff
- post :upload, :id => 1
+ post :upload, :id => cs_id
assert_response :conflict,
"uploading a diff with multiple changsets should have failed"
##
# upload multiple versions of the same element in the same diff.
def test_upload_multiple_valid
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
+ cs_id = changesets(:public_user_first_change).id
# change the location of a node multiple times, each time referencing
# the last version. doesn't this depend on version numbers being
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='0' lat='0' changeset='1' version='1'/>
- <node id='1' lon='1' lat='0' changeset='1' version='2'/>
- <node id='1' lon='1' lat='1' changeset='1' version='3'/>
- <node id='1' lon='1' lat='2' changeset='1' version='4'/>
- <node id='1' lon='2' lat='2' changeset='1' version='5'/>
- <node id='1' lon='3' lat='2' changeset='1' version='6'/>
- <node id='1' lon='3' lat='3' changeset='1' version='7'/>
- <node id='1' lon='9' lat='9' changeset='1' version='8'/>
+ <node id='1' lon='0' lat='0' changeset='#{cs_id}' version='1'/>
+ <node id='1' lon='1' lat='0' changeset='#{cs_id}' version='2'/>
+ <node id='1' lon='1' lat='1' changeset='#{cs_id}' version='3'/>
+ <node id='1' lon='1' lat='2' changeset='#{cs_id}' version='4'/>
+ <node id='1' lon='2' lat='2' changeset='#{cs_id}' version='5'/>
+ <node id='1' lon='3' lat='2' changeset='#{cs_id}' version='6'/>
+ <node id='1' lon='3' lat='3' changeset='#{cs_id}' version='7'/>
+ <node id='1' lon='9' lat='9' changeset='#{cs_id}' version='8'/>
</modify>
</osmChange>
EOF
# upload it
content diff
- post :upload, :id => 1
+ post :upload, :id => cs_id
assert_response :success,
"can't upload multiple versions of an element in a diff: #{@response.body}"
+
+ # check the response is well-formed. its counter-intuitive, but the
+ # API will return multiple elements with the same ID and different
+ # version numbers for each change we made.
+ assert_select "diffResult>node", 8
end
##
# 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 "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
+ cs_id = changesets(:public_user_first_change).id
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='0' lat='0' changeset='1' version='1'/>
- <node id='1' lon='1' lat='1' changeset='1' version='1'/>
+ <node id='1' lon='0' lat='0' changeset='#{cs_id}' version='1'/>
+ <node id='1' lon='1' lat='1' changeset='#{cs_id}' version='1'/>
</modify>
</osmChange>
EOF
# upload it
content diff
- post :upload, :id => 1
+ post :upload, :id => cs_id
assert_response :conflict,
"shouldn't be able to upload the same element twice in a diff: #{@response.body}"
end
##
# try to upload some elements without specifying the version
def test_upload_missing_version
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
+ cs_id = changesets(:public_user_first_change).id
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='1' lat='1' changeset='1'/>
+ <node id='1' lon='1' lat='1' changeset='cs_id'/>
</modify>
</osmChange>
EOF
# upload it
content diff
- post :upload, :id => 1
+ post :upload, :id => cs_id
assert_response :bad_request,
"shouldn't be able to upload an element without version: #{@response.body}"
end
##
# try to upload with commands other than create, modify, or delete
def test_action_upload_invalid
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
+ cs_id = changesets(:public_user_first_change).id
diff = <<EOF
<osmChange>
<ping>
- <node id='1' lon='1' lat='1' changeset='1' />
+ <node id='1' lon='1' lat='1' changeset='#{cs_id}' />
</ping>
</osmChange>
EOF
content diff
- post :upload, :id => 1
+ post :upload, :id => cs_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
+ ##
+ # 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
+<osmChange>
+ <modify><node id='1' lon='0' lat='0' changeset='#{changeset_id}'
+ version='1'></node>
+ <node id='1' lon='1' lat='1' changeset='#{changeset_id}' version='2'><tag k='k' v='v'/></node></modify>
+ <modify>
+ <relation id='1' changeset='#{changeset_id}' version='1'><member
+ type='way' role='some' ref='3'/><member
+ type='node' role='some' ref='5'/>
+ <member type='relation' role='some' ref='3'/>
+ </relation>
+ </modify></osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :success,
+ "can't upload a valid diff with whitespace variations to changeset: #{@response.body}"
+
+ # check the response is well-formed
+ assert_select "diffResult>node", 2
+ 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"
+ end
+
+ ##
+ # upload a valid changeset which has a mixture of whitespace
+ # to check a bug reported by ivansanchez.
+ def test_upload_reuse_placeholder_valid
+ basic_authorization users(:public_user).email, "test"
+ changeset_id = changesets(:public_user_first_change).id
+
+ diff = <<EOF
+<osmChange>
+ <create>
+ <node id='-1' lon='0' lat='0' changeset='#{changeset_id}'>
+ <tag k="foo" v="bar"/>
+ </node>
+ </create>
+ <modify>
+ <node id='-1' lon='1' lat='1' changeset='#{changeset_id}' version='1'/>
+ </modify>
+ <delete>
+ <node id='-1' lon='2' lat='2' changeset='#{changeset_id}' version='2'/>
+ </delete>
+</osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :success,
+ "can't upload a valid diff with re-used placeholders to changeset: #{@response.body}"
+
+ # check the response is well-formed
+ assert_select "diffResult>node", 3
+ assert_select "diffResult>node[old_id=-1]", 3
+ end
+
+ ##
+ # 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
+<osmChange>
+ <create>
+ <node id='-1' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
+ <node id='-1' lon='1' lat='1' changeset='#{changeset_id}' version='1'/>
+ <node id='-1' lon='2' lat='2' changeset='#{changeset_id}' version='2'/>
+ </create>
+</osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :bad_request,
+ "shouldn't be able to re-use placeholder IDs"
+ end
+
+ ##
+ # 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
+<osmChange>
+ <create>
+ <node id="-1" lon="0" lat="0" changeset="#{changeset_id}" version="1"/>
+ <node id="-2" lon="1" lat="1" changeset="#{changeset_id}" version="1"/>
+ <node id="-3" lon="2" lat="2" changeset="#{changeset_id}" version="1"/>
+ <way id="-1" changeset="#{changeset_id}" version="1">
+ <nd ref="-1"/>
+ <nd ref="-2"/>
+ <nd ref="-3"/>
+ <nd ref="-4"/>
+ </way>
+ </create>
+</osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :bad_request,
+ "shouldn't be able to use invalid placeholder IDs"
+ assert_equal "Placeholder node not found for reference -4 in way -1", @response.body
+
+ # the same again, but this time use an existing way
+ diff = <<EOF
+<osmChange>
+ <create>
+ <node id="-1" lon="0" lat="0" changeset="#{changeset_id}" version="1"/>
+ <node id="-2" lon="1" lat="1" changeset="#{changeset_id}" version="1"/>
+ <node id="-3" lon="2" lat="2" changeset="#{changeset_id}" version="1"/>
+ <way id="1" changeset="#{changeset_id}" version="1">
+ <nd ref="-1"/>
+ <nd ref="-2"/>
+ <nd ref="-3"/>
+ <nd ref="-4"/>
+ </way>
+ </create>
+</osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :bad_request,
+ "shouldn't be able to use invalid placeholder IDs"
+ assert_equal "Placeholder node not found for reference -4 in way 1", @response.body
+ 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
+<osmChange>
+ <create>
+ <node id="-1" lon="0" lat="0" changeset="#{changeset_id}" version="1"/>
+ <node id="-2" lon="1" lat="1" changeset="#{changeset_id}" version="1"/>
+ <node id="-3" lon="2" lat="2" changeset="#{changeset_id}" version="1"/>
+ <relation id="-1" changeset="#{changeset_id}" version="1">
+ <member type="node" role="foo" ref="-1"/>
+ <member type="node" role="foo" ref="-2"/>
+ <member type="node" role="foo" ref="-3"/>
+ <member type="node" role="foo" ref="-4"/>
+ </relation>
+ </create>
+</osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :bad_request,
+ "shouldn't be able to use invalid placeholder IDs"
+ assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body
+
+ # the same again, but this time use an existing way
+ diff = <<EOF
+<osmChange>
+ <create>
+ <node id="-1" lon="0" lat="0" changeset="#{changeset_id}" version="1"/>
+ <node id="-2" lon="1" lat="1" changeset="#{changeset_id}" version="1"/>
+ <node id="-3" lon="2" lat="2" changeset="#{changeset_id}" version="1"/>
+ <relation id="1" changeset="#{changeset_id}" version="1">
+ <member type="node" role="foo" ref="-1"/>
+ <member type="node" role="foo" ref="-2"/>
+ <member type="node" role="foo" ref="-3"/>
+ <member type="way" role="bar" ref="-1"/>
+ </relation>
+ </create>
+</osmChange>
+EOF
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :bad_request,
+ "shouldn't be able to use invalid placeholder IDs"
+ assert_equal "Placeholder Way not found for reference -1 in relation 1.", @response.body
+ 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"
+
+ content "<osm><changeset>" +
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
+ put :create
+ assert_response :success
+ changeset_id = @response.body.to_i
+
+ old_node = current_nodes(:visible_node)
+
+ diff = XML::Document.new
+ diff.root = XML::Node.new "osmChange"
+ modify = XML::Node.new "modify"
+ xml_old_node = old_node.to_xml_node
+ xml_old_node["lat"] = (2.0).to_s
+ xml_old_node["lon"] = (2.0).to_s
+ xml_old_node["changeset"] = changeset_id.to_s
+ modify << xml_old_node
+ diff.root << modify
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :success,
+ "diff should have uploaded OK"
+
+ # check the bbox
+ changeset = Changeset.find(changeset_id)
+ assert_equal 1*SCALE, changeset.min_lon, "min_lon should be 1 degree"
+ assert_equal 2*SCALE, changeset.max_lon, "max_lon should be 2 degrees"
+ assert_equal 1*SCALE, changeset.min_lat, "min_lat should be 1 degree"
+ assert_equal 2*SCALE, changeset.max_lat, "max_lat should be 2 degrees"
+ end
+
+ ##
+ # 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"
+
+ content "<osm><changeset>" +
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
+ put :create
+ assert_response :success
+ changeset_id = @response.body.to_i
+
+ old_way = current_ways(:visible_way)
+
+ 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
+ xml_old_way << nd_ref
+ xml_old_way["changeset"] = changeset_id.to_s
+ modify << xml_old_way
+ diff.root << modify
+
+ # upload it
+ content diff
+ post :upload, :id => changeset_id
+ assert_response :success,
+ "diff should have uploaded OK"
+
+ # check the bbox
+ changeset = Changeset.find(changeset_id)
+ assert_equal 1*SCALE, changeset.min_lon, "min_lon should be 1 degree"
+ assert_equal 3*SCALE, changeset.max_lon, "max_lon should be 3 degrees"
+ assert_equal 1*SCALE, changeset.min_lat, "min_lat should be 1 degree"
+ assert_equal 3*SCALE, changeset.max_lat, "max_lat should be 3 degrees"
+ end
+
+ ##
+ # test for more issues in #1568
+ def test_upload_empty_invalid
+ basic_authorization users(:public_user).email, "test"
+
+ [ "<osmChange/>",
+ "<osmChange></osmChange>",
+ "<osmChange><modify/></osmChange>",
+ "<osmChange><modify></modify></osmChange>"
+ ].each do |diff|
+ # upload it
+ content diff
+ post :upload, :id => changesets(:public_user_first_change).id
+ assert_response(:success, "should be able to upload " +
+ "empty changeset: " + diff)
+ end
+ end
+
##
# 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")
+ # create a temporary changeset
+ content "<osm><changeset>" +
+ "<tag k='created_by' v='osm test suite checking changesets'/>" +
+ "</changeset></osm>"
+ put :create
+ assert_response :forbidden
+
+
+
+ ## Now try with the public user
+ basic_authorization(users(:public_user).email, "test")
+
# create a temporary changeset
content "<osm><changeset>" +
"<tag k='created_by' v='osm test suite checking changesets'/>" +
#
# NOTE: the error turned out to be something else completely!
def test_josm_upload
- basic_authorization(users(:normal_user).email, "test")
+ basic_authorization(users(:public_user).email, "test")
# create a temporary changeset
content "<osm><changeset>" +
assert_response :success
changeset_id = @response.body.to_i
- diff = <<OSM
+ diff = <<OSMFILE
<osmChange version="0.6" generator="JOSM">
<create version="0.6" generator="JOSM">
<node id='-1' visible='true' changeset='#{changeset_id}' lat='51.49619982187321' lon='-0.18722061869438314' />
</way>
</create>
</osmChange>
-OSM
+OSMFILE
# upload it
content diff
# when we make some complex changes we get the same changes back from the
# diff download.
def test_diff_download_complex
- basic_authorization(users(:normal_user).email, "test")
+ basic_authorization(users(:public_user).email, "test")
# create a temporary changeset
content "<osm><changeset>" +
##
# 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 "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
# create a new changeset
content "<osm><changeset/></osm>"
assert_select "osm>changeset[min_lat=1.0]", 1
assert_select "osm>changeset[max_lat=2.0]", 1
- # add (delete) a way to it
+ # 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)
# get the bounding box back from the changeset
get :read, :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
##
# test that the changeset :include method works as it should
def test_changeset_include
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).display_name, "test"
# create a new changeset
content "<osm><changeset/></osm>"
basic_authorization "test@openstreetmap.org", "test"
get :query, :user => users(:normal_user).id
assert_response :success, "can't get changesets by user"
- assert_changesets [1,3,4,6]
+ assert_changesets [1,3,6]
get :query, :user => users(:normal_user).id, :open => true
assert_response :success, "can't get changesets by user and open"
- assert_changesets [1,4]
+ assert_changesets [1]
get :query, :time => '2007-12-31'
assert_response :success, "can't get changesets by time-since"
##
# 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
new_tag = XML::Node.new "tag"
assert_response :unauthorized
# try with the wrong authorization
- basic_authorization "test@example.com", "test"
+ basic_authorization users(:public_user).email, "test"
+ put :update, :id => changeset.id
+ assert_response :conflict
+
+ # now this should get an unauthorized
+ basic_authorization users(:normal_user).email, "test"
+ put :update, :id => 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)
+ new_changeset = changeset.to_xml
+ new_tag = XML::Node.new "tag"
+ new_tag['k'] = "tagtesting"
+ new_tag['v'] = "valuetesting"
+ new_changeset.find("//osm/changeset").first << new_tag
+ content new_changeset
+
+ # try without any authorization
+ @request.env["HTTP_AUTHORIZATION"] = nil
+ put :update, :id => changeset.id
+ assert_response :unauthorized
+
+ # try with the wrong authorization
+ basic_authorization users(:second_public_user).email, "test"
put :update, :id => changeset.id
assert_response :conflict
# now this should work...
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
put :update, :id => changeset.id
assert_response :success
# check that a user different from the one who opened the changeset
# can't modify it.
def test_changeset_update_invalid
- basic_authorization "test@example.com", "test"
+ basic_authorization users(:public_user).email, "test"
changeset = changesets(:normal_user_first_change)
new_changeset = changeset.to_xml
##
# 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 "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
# open a new changeset
content "<osm><changeset/></osm>"
"element limit.")
end
+ # 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)
+ assert @changesets.size <= 20
+ get :list
+ 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 => "Recent Changes", :count => 1
+ assert_select "table[id='keyvalue'] tr", :count => @changesets.size + 1
+ @changesets.each do |changeset|
+ # FIXME this test needs rewriting - test for table contents
+ end
+ end
+
#------------------------------------------------------------
# utility functions
#------------------------------------------------------------
projects / rails.git / blobdiff