)
assert_routing(
{ :path => "/api/0.6/relation/1/full", :method => :get },
- { :controller => "api/relations", :action => "full", :id => "1" }
+ { :controller => "api/relations", :action => "show", :full => true, :id => "1" }
)
assert_routing(
{ :path => "/api/0.6/relation/1/full.json", :method => :get },
- { :controller => "api/relations", :action => "full", :id => "1", :format => "json" }
+ { :controller => "api/relations", :action => "show", :full => true, :id => "1", :format => "json" }
)
assert_routing(
{ :path => "/api/0.6/relation/1", :method => :put },
{ :controller => "api/relations", :action => "destroy", :id => "1" }
)
- assert_routing(
- { :path => "/api/0.6/node/1/relations", :method => :get },
- { :controller => "api/relations", :action => "relations_for_node", :id => "1" }
- )
- assert_routing(
- { :path => "/api/0.6/way/1/relations", :method => :get },
- { :controller => "api/relations", :action => "relations_for_way", :id => "1" }
- )
- assert_routing(
- { :path => "/api/0.6/relation/1/relations", :method => :get },
- { :controller => "api/relations", :action => "relations_for_relation", :id => "1" }
- )
- assert_routing(
- { :path => "/api/0.6/node/1/relations.json", :method => :get },
- { :controller => "api/relations", :action => "relations_for_node", :id => "1", :format => "json" }
- )
- assert_routing(
- { :path => "/api/0.6/way/1/relations.json", :method => :get },
- { :controller => "api/relations", :action => "relations_for_way", :id => "1", :format => "json" }
- )
- assert_routing(
- { :path => "/api/0.6/relation/1/relations.json", :method => :get },
- { :controller => "api/relations", :action => "relations_for_relation", :id => "1", :format => "json" }
- )
-
assert_recognizes(
{ :controller => "api/relations", :action => "create" },
{ :path => "/api/0.6/relation/create", :method => :put }
end
def test_full_not_found
- get relation_full_path(999999)
+ get api_relation_path(999999, :full => true)
assert_response :not_found
end
def test_full_deleted
- get relation_full_path(create(:relation, :deleted))
+ get api_relation_path(create(:relation, :deleted), :full => true)
assert_response :gone
end
def test_full_empty
relation = create(:relation)
- get relation_full_path(relation)
+ get api_relation_path(relation, :full => true)
assert_response :success
assert_dom "relation", :count => 1 do
node = create(:node)
create(:relation_member, :relation => relation, :member => node)
- get relation_full_path(relation)
+ get api_relation_path(relation, :full => true)
assert_response :success
assert_dom "node", :count => 1 do
way = create(:way_with_nodes)
create(:relation_member, :relation => relation, :member => way)
- get relation_full_path(relation)
+ get api_relation_path(relation, :full => true)
assert_response :success
assert_dom "node", :count => 1 do
end
end
- ##
- # check that all relations containing a particular node, and no extra
- # relations, are returned from the relations_for_node call.
- def test_relations_for_node
+ def test_full_with_node_member_json
+ relation = create(:relation)
node = create(:node)
- # should include relations with that node as a member
- relation_with_node = create(:relation_member, :member => node).relation
- # should ignore relations without that node as a member
- _relation_without_node = create(:relation_member).relation
- # should ignore relations with the node involved indirectly, via a way
- way = create(:way_node, :node => node).way
- _relation_with_way = create(:relation_member, :member => way).relation
- # should ignore relations with the node involved indirectly, via a relation
- second_relation = create(:relation_member, :member => node).relation
- _super_relation = create(:relation_member, :member => second_relation).relation
- # should combine multiple relation_member references into just one relation entry
- create(:relation_member, :member => node, :relation => relation_with_node)
- # should not include deleted relations
- deleted_relation = create(:relation, :deleted)
- create(:relation_member, :member => node, :relation => deleted_relation)
-
- check_relations_for_element(node_relations_path(node), "node",
- node.id,
- [relation_with_node, second_relation])
- end
-
- def test_relations_for_way
- way = create(:way)
- # should include relations with that way as a member
- relation_with_way = create(:relation_member, :member => way).relation
- # should ignore relations without that way as a member
- _relation_without_way = create(:relation_member).relation
- # should ignore relations with the way involved indirectly, via a relation
- second_relation = create(:relation_member, :member => way).relation
- _super_relation = create(:relation_member, :member => second_relation).relation
- # should combine multiple relation_member references into just one relation entry
- create(:relation_member, :member => way, :relation => relation_with_way)
- # should not include deleted relations
- deleted_relation = create(:relation, :deleted)
- create(:relation_member, :member => way, :relation => deleted_relation)
+ create(:relation_member, :relation => relation, :member => node)
- check_relations_for_element(way_relations_path(way), "way",
- way.id,
- [relation_with_way, second_relation])
- end
+ get api_relation_path(relation, :full => true, :format => "json")
- def test_relations_for_relation
- relation = create(:relation)
- # should include relations with that relation as a member
- relation_with_relation = create(:relation_member, :member => relation).relation
- # should ignore any relation without that relation as a member
- _relation_without_relation = create(:relation_member).relation
- # should ignore relations with the relation involved indirectly, via a relation
- second_relation = create(:relation_member, :member => relation).relation
- _super_relation = create(:relation_member, :member => second_relation).relation
- # should combine multiple relation_member references into just one relation entry
- create(:relation_member, :member => relation, :relation => relation_with_relation)
- # should not include deleted relations
- deleted_relation = create(:relation, :deleted)
- create(:relation_member, :member => relation, :relation => deleted_relation)
- check_relations_for_element(relation_relations_path(relation), "relation",
- relation.id,
- [relation_with_relation, second_relation])
+ assert_response :success
+ js = ActiveSupport::JSON.decode(@response.body)
+ assert_not_nil js
+ assert_equal 2, js["elements"].count
+
+ js_relations = js["elements"].filter { |e| e["type"] == "relation" }
+ assert_equal 1, js_relations.count
+ assert_equal relation.id, js_relations[0]["id"]
+ assert_equal 1, js_relations[0]["members"].count
+ assert_equal "node", js_relations[0]["members"][0]["type"]
+ assert_equal node.id, js_relations[0]["members"][0]["ref"]
+
+ js_nodes = js["elements"].filter { |e| e["type"] == "node" }
+ assert_equal 1, js_nodes.count
+ assert_equal node.id, js_nodes[0]["id"]
end
# -------------------------------------
# check the ordering in the history tables:
with_controller(OldRelationsController.new) do
- get api_old_relation_path(relation_id, 2)
+ get api_relation_version_path(relation_id, 2)
assert_response :success, "can't read back version 2 of the relation #{relation_id}"
check_ordering(doc, @response.body)
end
# check the ordering in the history tables:
with_controller(OldRelationsController.new) do
- get api_old_relation_path(relation_id, 1)
+ get api_relation_version_path(relation_id, 1)
assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
check_ordering(doc, @response.body)
end
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
# members in the same order.
get api_relation_path(id)
else
with_controller(OldRelationsController.new) do
- get api_old_relation_path(id, ver)
+ get api_relation_version_path(id, ver)
end
end
assert_response :success
projects / rails.git / blobdiff