X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5cbd4038edb32b0304bd766e70fc680ea447b52b..c7d612df2d3a6d60582216a28a1426f351a41970:/test/controllers/relation_controller_test.rb
diff --git a/test/controllers/relation_controller_test.rb b/test/controllers/relation_controller_test.rb
index fb50ebc5b..bb8f2d437 100644
--- a/test/controllers/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -1,5 +1,5 @@
-require 'test_helper'
-require 'relation_controller'
+require "test_helper"
+require "relation_controller"
class RelationControllerTest < ActionController::TestCase
api_fixtures
@@ -68,21 +68,65 @@ class RelationControllerTest < ActionController::TestCase
# 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
+ 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, :sequence_id => 2)
+ # should not include deleted relations
+ deleted_relation = create(:relation, :deleted)
+ create(:relation_member, :member => node, :relation => deleted_relation)
+
check_relations_for_element(:relations_for_node, "node",
- current_nodes(:node_used_by_relationship).id,
- [:visible_relation, :used_relation])
+ 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, :sequence_id => 2)
+ # should not include deleted relations
+ deleted_relation = create(:relation, :deleted)
+ create(:relation_member, :member => way, :relation => deleted_relation)
+
check_relations_for_element(:relations_for_way, "way",
- current_ways(:used_way).id,
- [:visible_relation])
+ way.id,
+ [relation_with_way, second_relation])
end
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, :sequence_id => 2)
+ # should not include deleted relations
+ deleted_relation = create(:relation, :deleted)
+ create(:relation_member, :member => relation, :relation => deleted_relation)
check_relations_for_element(:relations_for_relation, "relation",
- current_relations(:used_relation).id,
- [:visible_relation])
+ relation.id,
+ [relation_with_relation, second_relation])
end
def check_relations_for_element(method, type, id, expected_relations)
@@ -96,19 +140,25 @@ class RelationControllerTest < ActionController::TestCase
# we should have only the expected number of relations
assert_select "osm>relation", expected_relations.size
- # and each of them should contain the node we originally searched for
- expected_relations.each do |r|
- relation_id = current_relations(r).id
- assert_select "osm>relation[id='#{relation_id}']>member[type='#{type}'][ref='#{id}']", 1
+ # 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
def test_full
# check the "full" mode
+ get :full, :id => 999999
+ assert_response :not_found
+
+ get :full, :id => current_relations(:invisible_relation).id
+ assert_response :gone
+
get :full, :id => current_relations(:visible_relation).id
assert_response :success
- # FIXME check whether this contains the stuff we want!
- print @response.body if $VERBOSE
+ # FIXME: check whether this contains the stuff we want!
end
##
@@ -160,8 +210,8 @@ class RelationControllerTest < ActionController::TestCase
# This time try with a role attribute in the relation
nid = current_nodes(:used_node_1).id
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
# hope for forbidden due to user
assert_response :forbidden,
@@ -172,7 +222,7 @@ class RelationControllerTest < ActionController::TestCase
# need a role attribute to be included
nid = current_nodes(:used_node_1).id
content "" +
- "" + ""
+ "" + ""
put :create
# hope for forbidden due to user
assert_response :forbidden,
@@ -183,9 +233,9 @@ class RelationControllerTest < ActionController::TestCase
nid = current_nodes(:used_node_1).id
wid = current_ways(:used_way).id
content "" +
- "" +
- "" +
- ""
+ "" +
+ "" +
+ ""
put :create
# hope for forbidden, due to user
assert_response :forbidden,
@@ -228,8 +278,8 @@ class RelationControllerTest < ActionController::TestCase
# This time try with a role attribute in the relation
nid = current_nodes(:used_node_1).id
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
# hope for success
assert_response :success,
@@ -260,7 +310,7 @@ class RelationControllerTest < ActionController::TestCase
# need a role attribute to be included
nid = current_nodes(:used_node_1).id
content "" +
- "" + ""
+ "" + ""
put :create
# hope for success
assert_response :success,
@@ -291,9 +341,9 @@ class RelationControllerTest < ActionController::TestCase
nid = current_nodes(:used_node_1).id
wid = current_ways(:used_way).id
content "" +
- "" +
- "" +
- ""
+ "" +
+ "" +
+ ""
put :create
# hope for success
assert_response :success,
@@ -332,12 +382,13 @@ class RelationControllerTest < ActionController::TestCase
def test_update_relation_tags
basic_authorization "test@example.com", "test"
rel_id = current_relations(:multi_tag_relation).id
+ create_list(:relation_tag, 4, :relation => current_relations(:multi_tag_relation))
cs_id = changesets(:public_user_first_change).id
with_relation(rel_id) do |rel|
# alter one of the tags
tag = rel.find("//osm/relation/tag").first
- tag['v'] = 'some changed value'
+ tag["v"] = "some changed value"
update_changeset(rel, cs_id)
# check that the downloaded tags are the same as the uploaded tags...
@@ -361,12 +412,13 @@ class RelationControllerTest < ActionController::TestCase
def test_update_relation_tags_via_upload
basic_authorization users(:public_user).email, "test"
rel_id = current_relations(:multi_tag_relation).id
+ create_list(:relation_tag, 4, :relation => current_relations(:multi_tag_relation))
cs_id = changesets(:public_user_first_change).id
with_relation(rel_id) do |rel|
# alter one of the tags
tag = rel.find("//osm/relation/tag").first
- tag['v'] = 'some changed value'
+ tag["v"] = "some changed value"
update_changeset(rel, cs_id)
# check that the downloaded tags are the same as the uploaded tags...
@@ -382,6 +434,19 @@ class RelationControllerTest < ActionController::TestCase
end
end
+ def test_update_wrong_id
+ basic_authorization users(:public_user).email, "test"
+ rel_id = current_relations(:multi_tag_relation).id
+ cs_id = changesets(:public_user_first_change).id
+
+ with_relation(rel_id) do |rel|
+ update_changeset(rel, cs_id)
+ content rel
+ put :update, :id => current_relations(:visible_relation).id
+ assert_response :bad_request
+ end
+ end
+
# -------------------------------------
# Test creating some invalid relations.
# -------------------------------------
@@ -394,8 +459,8 @@ class RelationControllerTest < ActionController::TestCase
# create a relation with non-existing node as member
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
# expect failure
assert_response :precondition_failed,
@@ -414,8 +479,8 @@ class RelationControllerTest < ActionController::TestCase
# create some xml that should return an error
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
# expect failure
assert_response :bad_request
@@ -566,8 +631,8 @@ class RelationControllerTest < ActionController::TestCase
relation_xml = current_relations(:visible_relation).to_xml
relation_element = relation_xml.find("//osm/relation").first
new_tag = XML::Node.new("tag")
- new_tag['k'] = "some_new_tag"
- new_tag['v'] = "some_new_value"
+ new_tag["k"] = "some_new_tag"
+ new_tag["v"] = "some_new_value"
relation_element << new_tag
# update changeset ID to point to new changeset
@@ -589,16 +654,15 @@ class RelationControllerTest < ActionController::TestCase
[current_nodes(:used_node_1),
current_nodes(:used_node_2),
current_ways(:used_way),
- current_ways(:way_with_versions)
- ].each_with_index do |element, _version|
+ current_ways(:way_with_versions)].each_with_index do |element, _version|
bbox = element.bbox.to_unscaled
check_changeset_modify(bbox) do |changeset_id|
relation_xml = Relation.find(relation_id).to_xml
relation_element = relation_xml.find("//osm/relation").first
new_member = XML::Node.new("member")
- new_member['ref'] = element.id.to_s
- new_member['type'] = element.class.to_s.downcase
- new_member['role'] = "some_role"
+ new_member["ref"] = element.id.to_s
+ new_member["type"] = element.class.to_s.downcase
+ new_member["role"] = "some_role"
relation_element << new_member
# update changeset ID to point to new changeset
@@ -667,13 +731,13 @@ OSM
# insert a member at the front
new_member = XML::Node.new "member"
- new_member['ref'] = 5.to_s
- new_member['type'] = 'node'
- new_member['role'] = 'new first'
+ new_member["ref"] = 5.to_s
+ new_member["type"] = "node"
+ new_member["role"] = "new first"
doc.find("//osm/relation").first.child.prev = new_member
# update the version, should be 1?
- doc.find("//osm/relation").first['id'] = relation_id.to_s
- doc.find("//osm/relation").first['version'] = 1.to_s
+ doc.find("//osm/relation").first["id"] = relation_id.to_s
+ doc.find("//osm/relation").first["version"] = 1.to_s
# upload the next version of the relation
content doc
@@ -800,11 +864,11 @@ OSM
new_doc = XML::Parser.string(xml).parse
doc_members = doc.find("//osm/relation/member").collect do |m|
- [m['ref'].to_i, m['type'].to_sym, m['role']]
+ [m["ref"].to_i, m["type"].to_sym, m["role"]]
end
new_members = new_doc.find("//osm/relation/member").collect do |m|
- [m['ref'].to_i, m['type'].to_sym, m['role']]
+ [m["ref"].to_i, m["type"].to_sym, m["role"]]
end
doc_members.zip(new_members).each do |d, n|
@@ -898,14 +962,14 @@ OSM
# the parsed XML doc is retured.
def with_update_diff(rel)
rel_id = rel.find("//osm/relation").first["id"].to_i
- cs_id = rel.find("//osm/relation").first['changeset'].to_i
+ cs_id = rel.find("//osm/relation").first["changeset"].to_i
version = nil
with_controller(ChangesetController.new) do
doc = OSM::API.new.get_xml_doc
- change = XML::Node.new 'osmChange'
+ change = XML::Node.new "osmChange"
doc.root = change
- modify = XML::Node.new 'modify'
+ modify = XML::Node.new "modify"
change << modify
modify << doc.import(rel.find("//osm/relation").first)
@@ -928,8 +992,8 @@ OSM
##
# returns a k->v hash of tags from an xml doc
def get_tags_as_hash(a)
- a.find("//osm/relation/tag").sort_by { |v| v['k'] }.each_with_object({}) do |v, h|
- h[v['k']] = v['v']
+ a.find("//osm/relation/tag").sort_by { |v| v["k"] }.each_with_object({}) do |v, h|
+ h[v["k"]] = v["v"]
end
end
@@ -945,14 +1009,14 @@ OSM
a_tags.each do |k, v|
assert_equal v, b_tags[k],
"Tags which were not altered should be the same. " +
- "#{a_tags.inspect} != #{b_tags.inspect}"
+ "#{a_tags.inspect} != #{b_tags.inspect}"
end
end
##
# update the changeset_id of a node element
def update_changeset(xml, changeset_id)
- xml_attr_rewrite(xml, 'changeset', changeset_id)
+ xml_attr_rewrite(xml, "changeset", changeset_id)
end
##