def test_read
# check that a visible relation is returned properly
- get :read, :id => create(:relation).id
+ get :read, :params => { :id => create(:relation).id }
assert_response :success
# check that an invisible relation is not returned
- get :read, :id => create(:relation, :deleted).id
+ get :read, :params => { :id => create(:relation, :deleted).id }
assert_response :gone
# check chat a non-existent relation is not returned
- get :read, :id => 0
+ get :read, :params => { :id => 0 }
assert_response :not_found
end
def check_relations_for_element(method, type, id, expected_relations)
# check the "relations for relation" mode
- get method, :id => id
+ get method, :params => { :id => id }
assert_response :success
# count one osm element
def test_full
# check the "full" mode
- get :full, :id => 999999
+ get :full, :params => { :id => 999999 }
assert_response :not_found
- get :full, :id => create(:relation, :deleted).id
+ get :full, :params => { :id => create(:relation, :deleted).id }
assert_response :gone
- get :full, :id => create(:relation).id
+ get :full, :params => { :id => create(:relation).id }
assert_response :success
# FIXME: check whether this contains the stuff we want!
end
assert_response :bad_request
# check error when no parameter value provided
- get :relations, :relations => ""
+ get :relations, :params => { :relations => "" }
assert_response :bad_request
# test a working call
- get :relations, :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id}"
+ get :relations, :params => { :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id}" }
assert_response :success
assert_select "osm" do
assert_select "relation", :count => 4
end
# check error when a non-existent relation is included
- get :relations, :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id},400"
+ get :relations, :params => { :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id},400" }
assert_response :not_found
end
###
# create an relation with a node as member
# This time try with a role attribute in the relation
- content "<osm><relation changeset='#{private_changeset.id}'>" +
- "<member ref='#{node.id}' type='node' role='some'/>" +
+ content "<osm><relation changeset='#{private_changeset.id}'>" \
+ "<member ref='#{node.id}' type='node' role='some'/>" \
"<tag k='test' v='yes' /></relation></osm>"
put :create
# hope for forbidden due to user
###
# create an relation with a node as member, this time test that we don't
# need a role attribute to be included
- content "<osm><relation changeset='#{private_changeset.id}'>" +
+ content "<osm><relation changeset='#{private_changeset.id}'>" \
"<member ref='#{node.id}' type='node'/>" + "<tag k='test' v='yes' /></relation></osm>"
put :create
# hope for forbidden due to user
###
# create an relation with a way and a node as members
- content "<osm><relation changeset='#{private_changeset.id}'>" +
- "<member type='node' ref='#{node.id}' role='some'/>" +
- "<member type='way' ref='#{way.id}' role='other'/>" +
+ content "<osm><relation changeset='#{private_changeset.id}'>" \
+ "<member type='node' ref='#{node.id}' role='some'/>" \
+ "<member type='way' ref='#{way.id}' role='other'/>" \
"<tag k='test' v='yes' /></relation></osm>"
put :create
# hope for forbidden, due to user
assert_equal true, checkrelation.visible,
"saved relation is not visible"
# ok the relation is there but can we also retrieve it?
- get :read, :id => relationid
+ get :read, :params => { :id => relationid }
assert_response :success
###
# create an relation with a node as member
# This time try with a role attribute in the relation
- content "<osm><relation changeset='#{changeset.id}'>" +
- "<member ref='#{node.id}' type='node' role='some'/>" +
+ content "<osm><relation changeset='#{changeset.id}'>" \
+ "<member ref='#{node.id}' type='node' role='some'/>" \
"<tag k='test' v='yes' /></relation></osm>"
put :create
# hope for success
"saved relation is not visible"
# ok the relation is there but can we also retrieve it?
- get :read, :id => relationid
+ get :read, :params => { :id => relationid }
assert_response :success
###
# create an relation with a node as member, this time test that we don't
# need a role attribute to be included
- content "<osm><relation changeset='#{changeset.id}'>" +
+ content "<osm><relation changeset='#{changeset.id}'>" \
"<member ref='#{node.id}' type='node'/>" + "<tag k='test' v='yes' /></relation></osm>"
put :create
# hope for success
"saved relation is not visible"
# ok the relation is there but can we also retrieve it?
- get :read, :id => relationid
+ get :read, :params => { :id => relationid }
assert_response :success
###
# create an relation with a way and a node as members
- content "<osm><relation changeset='#{changeset.id}'>" +
- "<member type='node' ref='#{node.id}' role='some'/>" +
- "<member type='way' ref='#{way.id}' role='other'/>" +
+ content "<osm><relation changeset='#{changeset.id}'>" \
+ "<member type='node' ref='#{node.id}' role='some'/>" \
+ "<member type='way' ref='#{way.id}' role='other'/>" \
"<tag k='test' v='yes' /></relation></osm>"
put :create
# hope for success
assert_equal true, checkrelation.visible,
"saved relation is not visible"
# ok the relation is there but can we also retrieve it?
- get :read, :id => relationid
+ get :read, :params => { :id => relationid }
assert_response :success
end
with_relation(relation.id) do |rel|
update_changeset(rel, changeset.id)
content rel
- put :update, :id => other_relation.id
+ put :update, :params => { :id => other_relation.id }
assert_response :bad_request
end
end
basic_authorization user.email, "test"
# create a relation with non-existing node as member
- content "<osm><relation changeset='#{changeset.id}'>" +
- "<member type='node' ref='0'/><tag k='test' v='yes' />" +
+ content "<osm><relation changeset='#{changeset.id}'>" \
+ "<member type='node' ref='0'/><tag k='test' v='yes' />" \
"</relation></osm>"
put :create
# expect failure
basic_authorization user.email, "test"
# create some xml that should return an error
- content "<osm><relation changeset='#{changeset.id}'>" +
- "<member type='type' ref='#{node.id}' role=''/>" +
+ content "<osm><relation changeset='#{changeset.id}'>" \
+ "<member type='type' ref='#{node.id}' role=''/>" \
"<tag k='tester' v='yep'/></relation></osm>"
put :create
# expect failure
create_list(:relation_tag, 4, :relation => multi_tag_relation)
## First try to delete relation without auth
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :unauthorized
## Then try with the private user, to make sure that you get a forbidden
- basic_authorization(private_user.email, "test")
+ basic_authorization private_user.email, "test"
# this shouldn't work, as we should need the payload...
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :forbidden
# try to delete without specifying a changeset
content "<osm><relation id='#{relation.id}'/></osm>"
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :forbidden
# try to delete with an invalid (closed) changeset
content update_changeset(relation.to_xml,
private_user_closed_changeset.id)
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :forbidden
# try to delete with an invalid (non-existent) changeset
content update_changeset(relation.to_xml, 0)
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :forbidden
# this won't work because the relation is in-use by another relation
content(used_relation.to_xml)
- delete :delete, :id => used_relation.id
+ delete :delete, :params => { :id => used_relation.id }
assert_response :forbidden
# this should work when we provide the appropriate payload...
content(relation.to_xml)
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :forbidden
# this won't work since the relation is already deleted
content(deleted_relation.to_xml)
- delete :delete, :id => deleted_relation.id
+ delete :delete, :params => { :id => deleted_relation.id }
assert_response :forbidden
# this won't work since the relation never existed
- delete :delete, :id => 0
+ delete :delete, :params => { :id => 0 }
assert_response :forbidden
## now set auth for the public user
- basic_authorization(user.email, "test")
+ basic_authorization user.email, "test"
# this shouldn't work, as we should need the payload...
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :bad_request
# try to delete without specifying a changeset
content "<osm><relation id='#{relation.id}' version='#{relation.version}' /></osm>"
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :bad_request
assert_match(/Changeset id is missing/, @response.body)
# try to delete with an invalid (closed) changeset
content update_changeset(relation.to_xml,
closed_changeset.id)
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :conflict
# try to delete with an invalid (non-existent) changeset
content update_changeset(relation.to_xml, 0)
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :conflict
# this won't work because the relation is in a changeset owned by someone else
content update_changeset(relation.to_xml, create(:changeset).id)
- delete :delete, :id => relation.id
+ delete :delete, :params => { :id => relation.id }
assert_response :conflict,
"shouldn't be able to delete a relation in a changeset owned by someone else (#{@response.body})"
# this won't work because the relation in the payload is different to that passed
content update_changeset(relation.to_xml, changeset.id)
- delete :delete, :id => create(:relation).id
+ delete :delete, :params => { :id => create(:relation).id }
assert_response :bad_request, "shouldn't be able to delete a relation when payload is different to the url"
# this won't work because the relation is in-use by another relation
content update_changeset(used_relation.to_xml, changeset.id)
- delete :delete, :id => used_relation.id
+ delete :delete, :params => { :id => used_relation.id }
assert_response :precondition_failed,
"shouldn't be able to delete a relation used in a relation (#{@response.body})"
assert_equal "Precondition failed: The relation #{used_relation.id} is used in relation #{super_relation.id}.", @response.body
# this should work when we provide the appropriate payload...
content update_changeset(multi_tag_relation.to_xml, changeset.id)
- delete :delete, :id => multi_tag_relation.id
+ delete :delete, :params => { :id => multi_tag_relation.id }
assert_response :success
# valid delete should return the new version number, which should
# this won't work since the relation is already deleted
content update_changeset(deleted_relation.to_xml, changeset.id)
- delete :delete, :id => deleted_relation.id
+ delete :delete, :params => { :id => deleted_relation.id }
assert_response :gone
# Public visible relation needs to be deleted
content update_changeset(super_relation.to_xml, changeset.id)
- delete :delete, :id => super_relation.id
+ delete :delete, :params => { :id => super_relation.id }
assert_response :success
# this works now because the relation which was using this one
# has been deleted.
content update_changeset(used_relation.to_xml, changeset.id)
- delete :delete, :id => used_relation.id
+ delete :delete, :params => { :id => used_relation.id }
assert_response :success,
"should be able to delete a relation used in an old relation (#{@response.body})"
# this won't work since the relation never existed
- delete :delete, :id => 0
+ delete :delete, :params => { :id => 0 }
assert_response :not_found
end
# upload the change
content relation_xml
- put :update, :id => relation.id
+ put :update, :params => { :id => relation.id }
assert_response :success, "can't update relation for tag/bbox test"
end
end
# upload the change
content relation_xml
- put :update, :id => relation.id
+ put :update, :params => { :id => relation.id }
assert_response :success, "can't update relation for add #{element.class}/bbox test: #{@response.body}"
# get it back and check the ordering
- get :read, :id => relation.id
+ get :read, :params => { :id => relation.id }
assert_response :success, "can't read back the relation: #{@response.body}"
check_ordering(relation_xml, @response.body)
end
# upload the change
content relation_xml
- put :update, :id => relation.id
+ put :update, :params => { :id => relation.id }
assert_response :success, "can't update relation for remove node/bbox test"
end
end
way1 = create(:way_with_nodes, :nodes_count => 2)
way2 = create(:way_with_nodes, :nodes_count => 2)
- basic_authorization(user.email, "test")
+ basic_authorization user.email, "test"
doc_str = <<OSM.strip_heredoc
<osm>
relation_id = @response.body.to_i
# get it back and check the ordering
- get :read, :id => relation_id
+ get :read, :params => { :id => relation_id }
assert_response :success, "can't read back the relation: #{@response.body}"
check_ordering(doc, @response.body)
# upload the next version of the relation
content doc
- put :update, :id => relation_id
+ put :update, :params => { :id => relation_id }
assert_response :success, "can't update relation: #{@response.body}"
assert_equal 2, @response.body.to_i
# get it back again and check the ordering again
- get :read, :id => relation_id
+ get :read, :params => { :id => relation_id }
assert_response :success, "can't read back the relation: #{@response.body}"
check_ordering(doc, @response.body)
# check the ordering in the history tables:
with_controller(OldRelationController.new) do
- get :version, :id => relation_id, :version => 2
+ get :version, :params => { :id => relation_id, :version => 2 }
assert_response :success, "can't read back version 2 of the relation #{relation_id}"
check_ordering(doc, @response.body)
end
doc = XML::Parser.string(doc_str).parse
## First try with the private user
- basic_authorization(private_user.email, "test")
+ basic_authorization private_user.email, "test"
content doc
put :create
assert_response :forbidden
## Now try with the public user
- basic_authorization(user.email, "test")
+ basic_authorization user.email, "test"
content doc
put :create
relation_id = @response.body.to_i
# get it back and check the ordering
- get :read, :id => relation_id
+ get :read, :params => { :id => relation_id }
assert_response :success, "can't read back the relation: #{relation_id}"
check_ordering(doc, @response.body)
end
</osm>
OSM
doc = XML::Parser.string(doc_str).parse
- basic_authorization(user.email, "test")
+ basic_authorization user.email, "test"
content doc
put :create
relation_id = @response.body.to_i
# check the ordering in the current tables:
- get :read, :id => relation_id
+ get :read, :params => { :id => relation_id }
assert_response :success, "can't read back the relation: #{@response.body}"
check_ordering(doc, @response.body)
# check the ordering in the history tables:
with_controller(OldRelationController.new) do
- get :version, :id => relation_id, :version => 1
+ get :version, :params => { :id => relation_id, :version => 1 }
assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
check_ordering(doc, @response.body)
end
# upload the change
content relation_xml
- put :update, :id => relation.id
+ put :update, :params => { :id => relation.id }
assert_response :success, "can't update relation for remove all members test"
checkrelation = Relation.find(relation.id)
assert_not_nil(checkrelation,
# that the changeset bounding box is +bbox+.
def check_changeset_modify(bbox)
## First test with the private user to check that you get a forbidden
- basic_authorization(create(:user, :data_public => false).email, "test")
+ basic_authorization create(:user, :data_public => false).email, "test"
# create a new changeset for this operation, so we are assured
# that the bounding box will be newly-generated.
end
## Now do the whole thing with the public user
- basic_authorization(create(:user).email, "test")
+ basic_authorization create(:user).email, "test"
# create a new changeset for this operation, so we are assured
# that the bounding box will be newly-generated.
# now download the changeset to check its bounding box
with_controller(ChangesetController.new) do
- get :read, :id => changeset_id
+ get :read, :params => { :id => changeset_id }
assert_response :success, "can't re-read changeset for modify test"
assert_select "osm>changeset", 1, "Changeset element doesn't exist in #{@response.body}"
assert_select "osm>changeset[id='#{changeset_id}']", 1, "Changeset id=#{changeset_id} doesn't exist in #{@response.body}"
- assert_select "osm>changeset[min_lon='#{bbox.min_lon}']", 1, "Changeset min_lon wrong in #{@response.body}"
- assert_select "osm>changeset[min_lat='#{bbox.min_lat}']", 1, "Changeset min_lat wrong in #{@response.body}"
- assert_select "osm>changeset[max_lon='#{bbox.max_lon}']", 1, "Changeset max_lon wrong in #{@response.body}"
- assert_select "osm>changeset[max_lat='#{bbox.max_lat}']", 1, "Changeset max_lat wrong in #{@response.body}"
+ assert_select "osm>changeset[min_lon='#{format('%.7f', bbox.min_lon)}']", 1, "Changeset min_lon wrong in #{@response.body}"
+ assert_select "osm>changeset[min_lat='#{format('%.7f', bbox.min_lat)}']", 1, "Changeset min_lat wrong in #{@response.body}"
+ assert_select "osm>changeset[max_lon='#{format('%.7f', bbox.max_lon)}']", 1, "Changeset max_lon wrong in #{@response.body}"
+ assert_select "osm>changeset[max_lat='#{format('%.7f', bbox.max_lat)}']", 1, "Changeset max_lat wrong in #{@response.body}"
end
end
# doc is returned.
def with_relation(id, ver = nil)
if ver.nil?
- get :read, :id => id
+ get :read, :params => { :id => id }
else
with_controller(OldRelationController.new) do
- get :version, :id => id, :version => ver
+ get :version, :params => { :id => id, :version => ver }
end
end
assert_response :success
def with_update(rel)
rel_id = rel.find("//osm/relation").first["id"].to_i
content rel
- put :update, :id => rel_id
+ put :update, :params => { :id => rel_id }
assert_response :success, "can't update relation: #{@response.body}"
version = @response.body.to_i
# now get the new version
- get :read, :id => rel_id
+ get :read, :params => { :id => rel_id }
assert_response :success
new_rel = xml_parse(@response.body)
modify << doc.import(rel.find("//osm/relation").first)
content doc.to_s
- post :upload, :id => cs_id
+ post :upload, :params => { :id => cs_id }
assert_response :success, "can't upload diff relation: #{@response.body}"
version = xml_parse(@response.body).find("//diffResult/relation").first["new_version"].to_i
end
# now get the new version
- get :read, :id => rel_id
+ get :read, :params => { :id => rel_id }
assert_response :success
new_rel = xml_parse(@response.body)
assert_equal a_tags.keys, b_tags.keys, "Tag keys should be identical."
a_tags.each do |k, v|
assert_equal v, b_tags[k],
- "Tags which were not altered should be the same. " +
+ "Tags which were not altered should be the same. " \
"#{a_tags.inspect} != #{b_tags.inspect}"
end
end
projects / rails.git / blobdiff