Clean up after creating nested relation resources
This commit is contained in:
parent
f696b5439e
commit
18b8e0cb34
2 changed files with 0 additions and 37 deletions
|
@ -122,23 +122,5 @@ module Api
|
||||||
head :bad_request
|
head :bad_request
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def relations_for_object(objtype)
|
|
||||||
relationids = RelationMember.where(:member_type => objtype, :member_id => params[:id]).collect(&:relation_id).uniq
|
|
||||||
|
|
||||||
@relations = []
|
|
||||||
|
|
||||||
Relation.find(relationids).each do |relation|
|
|
||||||
@relations << relation if relation.visible
|
|
||||||
end
|
|
||||||
|
|
||||||
# Render the result
|
|
||||||
respond_to do |format|
|
|
||||||
format.xml
|
|
||||||
format.json
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1013,25 +1013,6 @@ module Api
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def check_relations_for_element(path, type, id, expected_relations)
|
|
||||||
# check the "relations for relation" mode
|
|
||||||
get path
|
|
||||||
assert_response :success
|
|
||||||
|
|
||||||
# count one osm element
|
|
||||||
assert_select "osm[version='#{Settings.api_version}'][generator='#{Settings.generator}']", 1
|
|
||||||
|
|
||||||
# we should have only the expected number of relations
|
|
||||||
assert_select "osm>relation", expected_relations.size
|
|
||||||
|
|
||||||
# and each of them should contain the element we originally searched for
|
|
||||||
expected_relations.each do |relation|
|
|
||||||
# The relation should appear once, but the element could appear multiple times
|
|
||||||
assert_select "osm>relation[id='#{relation.id}']", 1
|
|
||||||
assert_select "osm>relation[id='#{relation.id}']>member[type='#{type}'][ref='#{id}']"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# checks that the XML document and the string arguments have
|
# checks that the XML document and the string arguments have
|
||||||
# members in the same order.
|
# members in the same order.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue