def test_upload_create_valid
user = create(:user)
changeset = create(:changeset, :user => user)
+ node = create(:node)
+ way = create(:way_with_nodes, :nodes_count => 2)
+ relation = create(:relation)
basic_authorization user.email, "test"
<tag k='baz' v='bat'/>
</node>
<way id='-1' changeset='#{changeset.id}'>
- <nd ref='3'/>
+ <nd ref='#{node.id}'/>
</way>
</create>
<create>
<relation id='-1' changeset='#{changeset.id}'>
- <member type='way' role='some' ref='3'/>
- <member type='node' role='some' ref='5'/>
- <member type='relation' role='some' ref='3'/>
+ <member type='way' role='some' ref='#{way.id}'/>
+ <member type='node' role='some' ref='#{node.id}'/>
+ <member type='relation' role='some' ref='#{relation.id}'/>
</relation>
</create>
</osmChange>
# test a complex delete where we delete elements which rely on eachother
# in the same transaction.
def test_upload_delete
- basic_authorization changesets(:public_user_first_change).user.display_name, "test"
+ changeset = create(:changeset)
+ super_relation = create(:relation)
+ used_relation = create(:relation)
+ used_way = create(:way)
+ used_node = create(:node)
+ create(:relation_member, :relation => super_relation, :member => used_relation)
+ create(:relation_member, :relation => super_relation, :member => used_way)
+ create(:relation_member, :relation => super_relation, :member => used_node)
+
+ basic_authorization changeset.user.display_name, "test"
diff = XML::Document.new
diff.root = XML::Node.new "osmChange"
delete = XML::Node.new "delete"
diff.root << delete
- delete << current_relations(:visible_relation).to_xml_node
- delete << current_relations(:used_relation).to_xml_node
- delete << current_ways(:used_way).to_xml_node
- delete << current_nodes(:node_used_by_relationship).to_xml_node
+ delete << super_relation.to_xml_node
+ delete << used_relation.to_xml_node
+ delete << used_way.to_xml_node
+ delete << used_node.to_xml_node
# update the changeset to one that this user owns
- changeset_id = changesets(:public_user_first_change).id
%w(node way relation).each do |type|
delete.find("//osmChange/delete/#{type}").each do |n|
- n["changeset"] = changeset_id.to_s
+ n["changeset"] = changeset.id.to_s
end
end
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :id => changeset.id
assert_response :success,
"can't upload a deletion diff to changeset: #{@response.body}"
assert_select "diffResult>relation", 2
# check that everything was deleted
- assert_equal false, Node.find(current_nodes(:node_used_by_relationship).id).visible
- assert_equal false, Way.find(current_ways(:used_way).id).visible
- assert_equal false, Relation.find(current_relations(:visible_relation).id).visible
- assert_equal false, Relation.find(current_relations(:used_relation).id).visible
+ assert_equal false, Node.find(used_node.id).visible
+ assert_equal false, Way.find(used_way.id).visible
+ assert_equal false, Relation.find(super_relation.id).visible
+ assert_equal false, Relation.find(used_relation.id).visible
end
##
# test uploading a delete with no lat/lon, as they are optional in
# the osmChange spec.
def test_upload_nolatlon_delete
- basic_authorization changesets(:public_user_first_change).user.display_name, "test"
+ node = create(:node)
+ changeset = create(:changeset)
- node = current_nodes(:public_visible_node)
- cs = changesets(:public_user_first_change)
- diff = "<osmChange><delete><node id='#{node.id}' version='#{node.version}' changeset='#{cs.id}'/></delete></osmChange>"
+ basic_authorization changeset.user.display_name, "test"
+ diff = "<osmChange><delete><node id='#{node.id}' version='#{node.version}' changeset='#{changeset.id}'/></delete></osmChange>"
# upload it
content diff
- post :upload, :id => cs.id
+ post :upload, :id => changeset.id
assert_response :success,
"can't upload a deletion diff to changeset: #{@response.body}"
# test that deleting stuff in a transaction doesn't bypass the checks
# to ensure that used elements are not deleted.
def test_upload_delete_invalid
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs = changesets(:public_user_first_change)
+ changeset = create(:changeset)
+ relation = create(:relation)
+ other_relation = create(:relation)
+ used_way = create(:way)
+ used_node = create(:node)
+ create(:relation_member, :relation => relation, :member => used_way)
+ create(:relation_member, :relation => relation, :member => used_node)
+
+ basic_authorization changeset.user.email, "test"
diff = XML::Document.new
diff.root = XML::Node.new "osmChange"
delete = XML::Node.new "delete"
diff.root << delete
- delete << current_relations(:public_visible_relation).to_xml_node
- delete << current_ways(:used_way).to_xml_node
- delete << current_nodes(:node_used_by_relationship).to_xml_node
+ delete << other_relation.to_xml_node
+ delete << used_way.to_xml_node
+ delete << used_node.to_xml_node
+
+ # update the changeset to one that this user owns
+ %w(node way relation).each do |type|
+ delete.find("//osmChange/delete/#{type}").each do |n|
+ n["changeset"] = changeset.id.to_s
+ end
+ end
# upload it
content diff
- post :upload, :id => cs.id
+ post :upload, :id => changeset.id
assert_response :precondition_failed,
"shouldn't be able to upload a invalid deletion diff: #{@response.body}"
- assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body
+ assert_equal "Precondition failed: Way #{used_way.id} is still used by relations #{relation.id}.", @response.body
# check that nothing was, in fact, deleted
- assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible
- assert_equal true, Way.find(current_ways(:used_way).id).visible
- assert_equal true, Relation.find(current_relations(:visible_relation).id).visible
+ assert_equal true, Node.find(used_node.id).visible
+ assert_equal true, Way.find(used_way.id).visible
+ assert_equal true, Relation.find(relation.id).visible
+ assert_equal true, Relation.find(other_relation.id).visible
end
##
# test that a conditional delete of an in use object works.
def test_upload_delete_if_unused
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs = changesets(:public_user_first_change)
+ changeset = create(:changeset)
+ super_relation = create(:relation)
+ used_relation = create(:relation)
+ used_way = create(:way)
+ used_node = create(:node)
+ create(:relation_member, :relation => super_relation, :member => used_relation)
+ create(:relation_member, :relation => super_relation, :member => used_way)
+ create(:relation_member, :relation => super_relation, :member => used_node)
+
+ basic_authorization changeset.user.email, "test"
diff = XML::Document.new
diff.root = XML::Node.new "osmChange"
delete = XML::Node.new "delete"
diff.root << delete
delete["if-unused"] = ""
- delete << current_relations(:public_used_relation).to_xml_node
- delete << current_ways(:used_way).to_xml_node
- delete << current_nodes(:node_used_by_relationship).to_xml_node
+ delete << used_relation.to_xml_node
+ delete << used_way.to_xml_node
+ delete << used_node.to_xml_node
+
+ # update the changeset to one that this user owns
+ %w(node way relation).each do |type|
+ delete.find("//osmChange/delete/#{type}").each do |n|
+ n["changeset"] = changeset.id.to_s
+ end
+ end
# upload it
content diff
- post :upload, :id => cs.id
+ post :upload, :id => changeset.id
assert_response :success,
"can't do a conditional delete of in use objects: #{@response.body}"
doc = XML::Parser.string(@response.body).parse
# check the old IDs are all present and what we expect
- assert_equal current_nodes(:node_used_by_relationship).id, doc.find("//diffResult/node").first["old_id"].to_i
- assert_equal current_ways(:used_way).id, doc.find("//diffResult/way").first["old_id"].to_i
- assert_equal current_relations(:public_used_relation).id, doc.find("//diffResult/relation").first["old_id"].to_i
+ assert_equal used_node.id, doc.find("//diffResult/node").first["old_id"].to_i
+ assert_equal used_way.id, doc.find("//diffResult/way").first["old_id"].to_i
+ assert_equal used_relation.id, doc.find("//diffResult/relation").first["old_id"].to_i
# check the new IDs are all present and unchanged
- assert_equal current_nodes(:node_used_by_relationship).id, doc.find("//diffResult/node").first["new_id"].to_i
- assert_equal current_ways(:used_way).id, doc.find("//diffResult/way").first["new_id"].to_i
- assert_equal current_relations(:public_used_relation).id, doc.find("//diffResult/relation").first["new_id"].to_i
+ assert_equal used_node.id, doc.find("//diffResult/node").first["new_id"].to_i
+ assert_equal used_way.id, doc.find("//diffResult/way").first["new_id"].to_i
+ assert_equal used_relation.id, doc.find("//diffResult/relation").first["new_id"].to_i
# check the new versions are all present and unchanged
- assert_equal current_nodes(:node_used_by_relationship).version, doc.find("//diffResult/node").first["new_version"].to_i
- assert_equal current_ways(:used_way).version, doc.find("//diffResult/way").first["new_version"].to_i
- assert_equal current_relations(:public_used_relation).version, doc.find("//diffResult/relation").first["new_version"].to_i
+ assert_equal used_node.version, doc.find("//diffResult/node").first["new_version"].to_i
+ assert_equal used_way.version, doc.find("//diffResult/way").first["new_version"].to_i
+ assert_equal used_relation.version, doc.find("//diffResult/relation").first["new_version"].to_i
# check that nothing was, in fact, deleted
- assert_equal true, Node.find(current_nodes(:node_used_by_relationship).id).visible
- assert_equal true, Way.find(current_ways(:used_way).id).visible
- assert_equal true, Relation.find(current_relations(:public_used_relation).id).visible
+ assert_equal true, Node.find(used_node.id).visible
+ assert_equal true, Way.find(used_way.id).visible
+ assert_equal true, Relation.find(used_relation.id).visible
end
##
# upload an element with a really long tag value
def test_upload_invalid_too_long_tag
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+
+ basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders
diff = <<EOF
<osmChange>
<create>
- <node id='-1' lon='0' lat='0' changeset='#{cs_id}'>
+ <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
<tag k='foo' v='#{'x' * 256}'/>
</node>
</create>
# upload it
content diff
- post :upload, :id => cs_id
+ post :upload, :id => changeset.id
assert_response :bad_request,
"shoudln't be able to upload too long a tag to changeset: #{@response.body}"
end
# upload something which creates new objects and inserts them into
# existing containers using placeholders.
def test_upload_complex
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs_id = changesets(:public_user_first_change).id
+ way = create(:way)
+ node = create(:node)
+ relation = create(:relation)
+ create(:way_node, :way => way, :node => node)
+
+ changeset = create(:changeset)
+
+ basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders
diff = <<EOF
<osmChange>
<create>
- <node id='-1' lon='0' lat='0' changeset='#{cs_id}'>
+ <node id='-1' lon='0' lat='0' changeset='#{changeset.id}'>
<tag k='foo' v='bar'/>
<tag k='baz' v='bat'/>
</node>
</create>
<modify>
- <way id='1' changeset='#{cs_id}' version='1'>
+ <way id='#{way.id}' changeset='#{changeset.id}' version='1'>
<nd ref='-1'/>
- <nd ref='3'/>
+ <nd ref='#{node.id}'/>
</way>
- <relation id='1' changeset='#{cs_id}' version='1'>
- <member type='way' role='some' ref='3'/>
+ <relation id='#{relation.id}' changeset='#{changeset.id}' version='1'>
+ <member type='way' role='some' ref='#{way.id}'/>
<member type='node' role='some' ref='-1'/>
- <member type='relation' role='some' ref='3'/>
+ <member type='relation' role='some' ref='#{relation.id}'/>
</relation>
</modify>
</osmChange>
# upload it
content diff
- post :upload, :id => cs_id
+ post :upload, :id => changeset.id
assert_response :success,
"can't upload a complex diff to changeset: #{@response.body}"
# check that the changes made it into the database
assert_equal 2, Node.find(new_node_id).tags.size, "new node should have two tags"
- assert_equal [new_node_id, 3], Way.find(1).nds, "way nodes should match"
- Relation.find(1).members.each do |type, id, _role|
+ assert_equal [new_node_id, node.id], Way.find(way.id).nds, "way nodes should match"
+ Relation.find(relation.id).members.each do |type, id, _role|
if type == "node"
assert_equal new_node_id, id, "relation should contain new node"
end
# create a diff which references several changesets, which should cause
# a rollback and none of the diff gets committed
def test_upload_invalid_changesets
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+ other_changeset = create(:changeset, :user => changeset.user)
+ node = create(:node)
+ way = create(:way)
+ relation = create(:relation)
+ other_relation = create(:relation)
+
+ basic_authorization changeset.user.email, "test"
# simple diff to create a node way and relation using placeholders
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='0' lat='0' changeset='#{cs_id}' version='1'/>
- <way id='1' changeset='#{cs_id}' version='1'>
- <nd ref='3'/>
+ <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+ <way id='#{way.id}' changeset='#{changeset.id}' version='1'>
+ <nd ref='#{node.id}'/>
</way>
</modify>
<modify>
- <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'/>
+ <relation id='#{relation.id}' changeset='#{changeset.id}' version='1'>
+ <member type='way' role='some' ref='#{way.id}'/>
+ <member type='node' role='some' ref='#{node.id}'/>
+ <member type='relation' role='some' ref='#{other_relation.id}'/>
</relation>
</modify>
<create>
- <node id='-1' lon='0' lat='0' changeset='4'>
+ <node id='-1' lon='0' lat='0' changeset='#{other_changeset.id}'>
<tag k='foo' v='bar'/>
<tag k='baz' v='bat'/>
</node>
</create>
</osmChange>
EOF
- # cache the objects before uploading them
- node = current_nodes(:visible_node)
- way = current_ways(:visible_way)
- rel = current_relations(:visible_relation)
# upload it
content diff
- post :upload, :id => cs_id
+ post :upload, :id => changeset.id
assert_response :conflict,
- "uploading a diff with multiple changsets should have failed"
+ "uploading a diff with multiple changesets should have failed"
# check that objects are unmodified
- assert_nodes_are_equal(node, Node.find(1))
- assert_ways_are_equal(way, Way.find(1))
- assert_relations_are_equal(rel, Relation.find(1))
+ assert_nodes_are_equal(node, Node.find(node.id))
+ assert_ways_are_equal(way, Way.find(way.id))
+ assert_relations_are_equal(relation, Relation.find(relation.id))
end
##
# upload multiple versions of the same element in the same diff.
def test_upload_multiple_valid
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs_id = changesets(:public_user_first_change).id
+ node = create(:node)
+ changeset = create(:changeset)
+ basic_authorization changeset.user.email, "test"
# change the location of a node multiple times, each time referencing
# the last version. doesn't this depend on version numbers being
diff = <<EOF
<osmChange>
<modify>
- <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'/>
+ <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+ <node id='#{node.id}' lon='1' lat='0' changeset='#{changeset.id}' version='2'/>
+ <node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='3'/>
+ <node id='#{node.id}' lon='1' lat='2' changeset='#{changeset.id}' version='4'/>
+ <node id='#{node.id}' lon='2' lat='2' changeset='#{changeset.id}' version='5'/>
+ <node id='#{node.id}' lon='3' lat='2' changeset='#{changeset.id}' version='6'/>
+ <node id='#{node.id}' lon='3' lat='3' changeset='#{changeset.id}' version='7'/>
+ <node id='#{node.id}' lon='9' lat='9' changeset='#{changeset.id}' version='8'/>
</modify>
</osmChange>
EOF
# upload it
content diff
- post :upload, :id => cs_id
+ post :upload, :id => changeset.id
assert_response :success,
"can't upload multiple versions of an element in a diff: #{@response.body}"
# upload multiple versions of the same element in the same diff, but
# keep the version numbers the same.
def test_upload_multiple_duplicate
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs_id = changesets(:public_user_first_change).id
+ node = create(:node)
+ changeset = create(:changeset)
+
+ basic_authorization changeset.user.email, "test"
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='0' lat='0' changeset='#{cs_id}' version='1'/>
- <node id='1' lon='1' lat='1' changeset='#{cs_id}' version='1'/>
+ <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset.id}' version='1'/>
+ <node id='#{node.id}' lon='1' lat='1' changeset='#{changeset.id}' version='1'/>
</modify>
</osmChange>
EOF
# upload it
content diff
- post :upload, :id => cs_id
+ post :upload, :id => changeset.id
assert_response :conflict,
"shouldn't be able to upload the same element twice in a diff: #{@response.body}"
end
##
# try to upload some elements without specifying the version
def test_upload_missing_version
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+
+ basic_authorization changeset.user.email, "test"
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='1' lat='1' changeset='cs_id'/>
+ <node id='1' lon='1' lat='1' changeset='#{changeset.id}'/>
</modify>
</osmChange>
EOF
# upload it
content diff
- post :upload, :id => cs_id
+ post :upload, :id => changeset.id
assert_response :bad_request,
"shouldn't be able to upload an element without version: #{@response.body}"
end
##
# try to upload with commands other than create, modify, or delete
def test_action_upload_invalid
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+
+ basic_authorization changeset.user.email, "test"
diff = <<EOF
<osmChange>
<ping>
- <node id='1' lon='1' lat='1' changeset='#{cs_id}' />
+ <node id='1' lon='1' lat='1' changeset='#{changeset.id}' />
</ping>
</osmChange>
EOF
content diff
- post :upload, :id => cs_id
+ post :upload, :id => changeset.id
assert_response :bad_request, "Shouldn't be able to upload a diff with the action ping"
assert_equal @response.body, "Unknown action ping, choices are create, modify, delete"
end
# upload a valid changeset which has a mixture of whitespace
# to check a bug reported by ivansanchez (#1565).
def test_upload_whitespace_valid
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- changeset_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+ node = create(:node)
+ way = create(:way_with_nodes, :nodes_count => 2)
+ relation = create(:relation)
+ other_relation = create(:relation)
+ create(:relation_tag, :relation => relation)
+
+ basic_authorization changeset.user.email, "test"
diff = <<EOF
<osmChange>
- <modify><node id='1' lon='0' lat='0' changeset='#{changeset_id}'
+ <modify><node id='#{node.id}' 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>
+ <node id='#{node.id}' 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 id='#{relation.id}' changeset='#{changeset.id}' version='1'><member
+ type='way' role='some' ref='#{way.id}'/><member
+ type='node' role='some' ref='#{node.id}'/>
+ <member type='relation' role='some' ref='#{other_relation.id}'/>
</relation>
</modify></osmChange>
EOF
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :id => changeset.id
assert_response :success,
"can't upload a valid diff with whitespace variations to changeset: #{@response.body}"
assert_select "diffResult>relation", 1
# check that the changes made it into the database
- assert_equal 1, Node.find(1).tags.size, "node 1 should now have one tag"
- assert_equal 0, Relation.find(1).tags.size, "relation 1 should now have no tags"
+ assert_equal 1, Node.find(node.id).tags.size, "node #{node.id} should now have one tag"
+ assert_equal 0, Relation.find(relation.id).tags.size, "relation #{relation.id} should now have no tags"
end
##
- # upload a valid changeset which has a mixture of whitespace
- # to check a bug reported by ivansanchez.
+ # test that a placeholder can be reused within the same upload.
def test_upload_reuse_placeholder_valid
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- changeset_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+
+ basic_authorization changeset.user.email, "test"
diff = <<EOF
<osmChange>
<create>
- <node id='-1' lon='0' lat='0' changeset='#{changeset_id}'>
+ <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'/>
+ <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'/>
+ <node id='-1' lon='2' lat='2' changeset='#{changeset.id}' version='2'/>
</delete>
</osmChange>
EOF
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :id => changeset.id
assert_response :success,
"can't upload a valid diff with re-used placeholders to changeset: #{@response.body}"
# test what happens if a diff upload re-uses placeholder IDs in an
# illegal way.
def test_upload_placeholder_invalid
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- changeset_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+
+ basic_authorization changeset.user.email, "test"
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'/>
+ <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
+ 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 changesets(:public_user_first_change).user.email, "test"
- changeset_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+ way = create(:way)
+
+ basic_authorization changeset.user.email, "test"
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">
+ <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"/>
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :id => changeset.id
assert_response :bad_request,
"shouldn't be able to use invalid placeholder IDs"
assert_equal "Placeholder node not found for reference -4 in way -1", @response.body
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">
+ <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="#{way.id}" changeset="#{changeset.id}" version="1">
<nd ref="-1"/>
<nd ref="-2"/>
<nd ref="-3"/>
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :id => changeset.id
assert_response :bad_request,
"shouldn't be able to use invalid placeholder IDs"
- assert_equal "Placeholder node not found for reference -4 in way 1", @response.body
+ assert_equal "Placeholder node not found for reference -4 in way #{way.id}", @response.body
end
##
# test that uploading a relation referencing invalid placeholders gives a
# proper error, not a 500.
def test_upload_placeholder_invalid_relation
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- changeset_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+ relation = create(:relation)
+
+ basic_authorization changeset.user.email, "test"
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">
+ <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"/>
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :id => changeset.id
assert_response :bad_request,
"shouldn't be able to use invalid placeholder IDs"
assert_equal "Placeholder Node not found for reference -4 in relation -1.", @response.body
- # the same again, but this time use an existing way
+ # the same again, but this time use an existing relation
diff = <<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">
+ <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="#{relation.id}" 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"/>
# upload it
content diff
- post :upload, :id => changeset_id
+ post :upload, :id => changeset.id
assert_response :bad_request,
"shouldn't be able to use invalid placeholder IDs"
- assert_equal "Placeholder Way not found for reference -1 in relation 1.", @response.body
+ assert_equal "Placeholder Way not found for reference -1 in relation #{relation.id}.", @response.body
end
##
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"
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
##
# test for more issues in #1568
def test_upload_empty_invalid
- basic_authorization changesets(:public_user_first_change).user.email, "test"
+ changeset = create(:changeset)
+
+ basic_authorization changeset.user.email, "test"
["<osmChange/>",
"<osmChange></osmChange>",
"<osmChange><modify></modify></osmChange>"].each do |diff|
# upload it
content diff
- post :upload, :id => changesets(:public_user_first_change).id
+ post :upload, :id => changeset.id
assert_response(:success, "should be able to upload " +
"empty changeset: " + diff)
end
##
# test that the X-Error-Format header works to request XML errors
def test_upload_xml_errors
- basic_authorization changesets(:public_user_first_change).user.email, "test"
- cs = changesets(:public_user_first_change)
+ changeset = create(:changeset)
+ node = create(:node)
+ create(:relation_member, :member => node)
+
+ basic_authorization changeset.user.email, "test"
# try and delete a node that is in use
diff = XML::Document.new
diff.root = XML::Node.new "osmChange"
delete = XML::Node.new "delete"
diff.root << delete
- delete << current_nodes(:node_used_by_relationship).to_xml_node
+ delete << node.to_xml_node
# upload it
content diff
error_format "xml"
- post :upload, :id => cs.id
+ post :upload, :id => changeset.id
assert_response :success,
"failed to return error in XML format"
# when we make some simple changes we get the same changes back from the
# diff download.
def test_diff_download_simple
+ node = create(:node)
+
## First try with a non-public user, which should get a forbidden
basic_authorization(create(:user, :data_public => false).email, "test")
diff = <<EOF
<osmChange>
<modify>
- <node id='1' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
- <node id='1' lon='1' lat='0' changeset='#{changeset_id}' version='2'/>
- <node id='1' lon='1' lat='1' changeset='#{changeset_id}' version='3'/>
- <node id='1' lon='1' lat='2' changeset='#{changeset_id}' version='4'/>
- <node id='1' lon='2' lat='2' changeset='#{changeset_id}' version='5'/>
- <node id='1' lon='3' lat='2' changeset='#{changeset_id}' version='6'/>
- <node id='1' lon='3' lat='3' changeset='#{changeset_id}' version='7'/>
- <node id='1' lon='9' lat='9' changeset='#{changeset_id}' version='8'/>
+ <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
+ <node id='#{node.id}' lon='1' lat='0' changeset='#{changeset_id}' version='2'/>
+ <node id='#{node.id}' lon='1' lat='1' changeset='#{changeset_id}' version='3'/>
+ <node id='#{node.id}' lon='1' lat='2' changeset='#{changeset_id}' version='4'/>
+ <node id='#{node.id}' lon='2' lat='2' changeset='#{changeset_id}' version='5'/>
+ <node id='#{node.id}' lon='3' lat='2' changeset='#{changeset_id}' version='6'/>
+ <node id='#{node.id}' lon='3' lat='3' changeset='#{changeset_id}' version='7'/>
+ <node id='#{node.id}' lon='9' lat='9' changeset='#{changeset_id}' version='8'/>
</modify>
</osmChange>
EOF
# when we make some complex changes we get the same changes back from the
# diff download.
def test_diff_download_complex
+ node = create(:node)
+ node2 = create(:node)
+ way = create(:way)
basic_authorization(create(:user).email, "test")
# create a temporary changeset
diff = <<EOF
<osmChange>
<delete>
- <node id='1' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
+ <node id='#{node.id}' lon='0' lat='0' changeset='#{changeset_id}' version='1'/>
</delete>
<create>
<node id='-1' lon='9' lat='9' changeset='#{changeset_id}' version='0'/>
<node id='-3' lon='7' lat='9' changeset='#{changeset_id}' version='0'/>
</create>
<modify>
- <node id='3' lon='20' lat='15' changeset='#{changeset_id}' version='1'/>
- <way id='1' changeset='#{changeset_id}' version='1'>
- <nd ref='3'/>
+ <node id='#{node2.id}' lon='20' lat='15' changeset='#{changeset_id}' version='1'/>
+ <way id='#{way.id}' changeset='#{changeset_id}' version='1'>
+ <nd ref='#{node2.id}'/>
<nd ref='-1'/>
<nd ref='-2'/>
<nd ref='-3'/>
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, :id => changeset.id
assert_response :success
assert_template nil
# 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
# check that the bounding box of a changeset gets updated correctly
# FIXME: This should really be moded to a integration test due to the with_controller
def test_changeset_bbox
+ way = create(:way)
+ create(:way_node, :way => way, :node => create(:node, :lat => 3, :lon => 3))
+
basic_authorization create(:user).email, "test"
# create a new changeset
# add (delete) a way to it, which contains a point at (3,3)
with_controller(WayController.new) do
- content update_changeset(current_ways(:visible_way).to_xml,
- changeset_id)
- put :delete, :id => current_ways(:visible_way).id
+ content update_changeset(way.to_xml, changeset_id)
+ put :delete, :id => way.id
assert_response :success, "Couldn't delete a way."
end
##
# check updating tags on a changeset
def test_changeset_update
+ 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
- changeset = changesets(:normal_user_first_change)
- new_changeset = changeset.to_xml
+ new_changeset = private_changeset.to_xml
new_tag = XML::Node.new "tag"
new_tag["k"] = "tagtesting"
new_tag["v"] = "valuetesting"
content new_changeset
# try without any authorization
- put :update, :id => changeset.id
+ put :update, :id => private_changeset.id
assert_response :unauthorized
# try with the wrong authorization
basic_authorization create(:user).email, "test"
- put :update, :id => changeset.id
+ put :update, :id => private_changeset.id
assert_response :conflict
# now this should get an unauthorized
- basic_authorization changeset.user.email, "test"
- put :update, :id => changeset.id
+ basic_authorization private_user.email, "test"
+ put :update, :id => private_changeset.id
assert_require_public_data "user with their data non-public, shouldn't be able to edit their changeset"
## Now try with the public user
- changeset = changesets(:public_user_first_change)
create(:changeset_tag, :changeset => changeset)
new_changeset = changeset.to_xml
new_tag = XML::Node.new "tag"
assert_response :conflict
# now this should work...
- basic_authorization changeset.user.email, "test"
+ basic_authorization user.email, "test"
put :update, :id => changeset.id
assert_response :success
def test_changeset_update_invalid
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"
##
# This should display the last 20 changesets closed
def test_feed
+ changeset = create(:changeset, :num_changes => 1)
+ _empty_changeset = create(:changeset, :num_changes => 0)
+
get :feed, :format => :atom
assert_response :success
assert_template "list"
assert_equal "application/atom+xml", response.content_type
- check_feed_result(Changeset.all)
+ check_feed_result([changeset])
end
##
# This should display the last 20 changesets closed in a specific area
def test_feed_bbox
+ changeset = create(:changeset, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
+ closed_changeset = create(:changeset, :closed, :num_changes => 1, :min_lat => 5 * GeoRecord::SCALE, :min_lon => 5 * GeoRecord::SCALE, :max_lat => 5 * GeoRecord::SCALE, :max_lon => 5 * GeoRecord::SCALE)
+ _elsewhere_changeset = create(:changeset, :num_changes => 1, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
+ _empty_changeset = create(:changeset, :num_changes => 0, :min_lat => -5 * GeoRecord::SCALE, :min_lon => -5 * GeoRecord::SCALE, :max_lat => -5 * GeoRecord::SCALE, :max_lon => -5 * GeoRecord::SCALE)
+
get :feed, :format => :atom, :bbox => "4.5,4.5,5.5,5.5"
assert_response :success
assert_template "list"
assert_equal "application/atom+xml", response.content_type
- check_feed_result(Changeset.where("min_lon < 55000000 and max_lon > 45000000 and min_lat < 55000000 and max_lat > 45000000"))
+ check_feed_result([changeset, closed_changeset])
end
##
# Checks the display of the user changesets feed
def test_feed_user
user = create(:user)
- create_list(:changeset, 3, :user => user, :num_changes => 4)
+ changesets = create_list(:changeset, 3, :user => user, :num_changes => 4)
+ _other_changeset = create(:changeset)
get :feed, :format => :atom, :display_name => user.display_name
assert_response :success
assert_template "list"
assert_equal "application/atom+xml", response.content_type
- check_feed_result(user.changesets)
+ check_feed_result(changesets)
end
##
# check that the changeset download for a changeset with a redacted
# element in it doesn't contain that element.
def test_diff_download_redacted
- changeset_id = changesets(:public_user_first_change).id
+ changeset = create(:changeset)
+ node = create(:node, :with_history, :version => 2, :changeset => changeset)
+ node_v1 = node.old_nodes.find_by(:version => 1)
+ node_v1.redact!(create(:redaction))
- get :download, :id => changeset_id
+ get :download, :id => changeset.id
assert_response :success
assert_select "osmChange", 1
- # this changeset contains node 17 in versions 1 & 2, but 1 should
+ # this changeset contains the node in versions 1 & 2, but 1 should
# be hidden.
- assert_select "osmChange node[id='17']", 1
- assert_select "osmChange node[id='17'][version='1']", 0
+ assert_select "osmChange node[id='#{node.id}']", 1
+ assert_select "osmChange node[id='#{node.id}'][version='1']", 0
end
##
# create comment fail
def test_create_comment_fail
# unauthorized
- post :comment, :id => changesets(:normal_user_closed_change).id, :text => "This is a comment"
+ post :comment, :id => create(:changeset, :closed).id, :text => "This is a comment"
assert_response :unauthorized
basic_authorization(create(:user).email, "test")
# 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, :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, :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, :id => create(:changeset, :closed).id, :text => ""
end
assert_response :bad_request
end
# test subscribe success
def test_subscribe_success
basic_authorization(create(:user).email, "test")
- changeset = changesets(:normal_user_closed_change)
+ changeset = create(:changeset, :closed)
assert_difference "changeset.subscribers.count", 1 do
post :subscribe, :id => changeset.id
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
end
assert_response :not_found
# not closed changeset
- changeset = changesets(:normal_user_first_change)
+ changeset = create(:changeset)
assert_no_difference "changeset.subscribers.count" do
post :subscribe, :id => changeset.id
end
assert_response :conflict
# trying to subscribe when already subscribed
- changeset = changesets(:normal_user_subscribed_change)
+ changeset = create(:changeset, :closed)
changeset.subscribers.push(user)
assert_no_difference "changeset.subscribers.count" do
post :subscribe, :id => changeset.id
def test_unsubscribe_success
user = create(:user)
basic_authorization(user.email, "test")
- changeset = changesets(:normal_user_subscribed_change)
+ changeset = create(:changeset, :closed)
changeset.subscribers.push(user)
assert_difference "changeset.subscribers.count", -1 do
# 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
end
assert_response :not_found
# not closed changeset
- changeset = changesets(:normal_user_first_change)
+ changeset = create(:changeset)
assert_no_difference "changeset.subscribers.count" do
post :unsubscribe, :id => changeset.id
end
assert_response :conflict
# trying to unsubscribe when not subscribed
- changeset = changesets(:normal_user_closed_change)
+ changeset = create(:changeset, :closed)
assert_no_difference "changeset.subscribers.count" do
post :unsubscribe, :id => changeset.id
end
##
# 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"
assert_response :success
end
end
- get :comments_feed, :id => changesets(:normal_user_closed_change), :format => "rss"
+ get :comments_feed, :id => changeset.id, :format => "rss"
assert_response :success
assert_equal "application/rss+xml", @response.content_type
assert_select "rss", :count => 1 do
##
# 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
projects / rails.git / blobdiff