X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ef7f3d800cbdd49b692df10d312e5fd880e2e938..119016255ec56bb7e7bc74be19858380e868da93:/test/controllers/relation_controller_test.rb
diff --git a/test/controllers/relation_controller_test.rb b/test/controllers/relation_controller_test.rb
index 2650d706c..ab0aca45e 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
@@ -105,12 +105,15 @@ class RelationControllerTest < ActionController::TestCase
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!
- if $VERBOSE
- print @response.body
- end
+ # FIXME: check whether this contains the stuff we want!
end
##
@@ -162,8 +165,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,
@@ -174,7 +177,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,
@@ -185,9 +188,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,
@@ -230,8 +233,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,
@@ -262,7 +265,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,
@@ -293,9 +296,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,
@@ -339,7 +342,7 @@ class RelationControllerTest < ActionController::TestCase
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...
@@ -368,7 +371,7 @@ class RelationControllerTest < ActionController::TestCase
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...
@@ -384,6 +387,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.
# -------------------------------------
@@ -396,8 +412,8 @@ class RelationControllerTest < ActionController::TestCase
# create a relation with non-existing node as member
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
# expect failure
assert_response :precondition_failed,
@@ -416,8 +432,8 @@ class RelationControllerTest < ActionController::TestCase
# create some xml that should return an error
content "" +
- "" +
- ""
+ "" +
+ ""
put :create
# expect failure
assert_response :bad_request
@@ -568,8 +584,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
@@ -591,16 +607,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
@@ -669,19 +684,19 @@ 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
put :update, :id => relation_id
assert_response :success, "can't update relation: #{@response.body}"
- new_version = @response.body.to_i
+ assert_equal 2, @response.body.to_i
# get it back again and check the ordering again
get :read, :id => relation_id
@@ -802,11 +817,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|
@@ -900,14 +915,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)
@@ -930,9 +945,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'] }.inject({}) do |h, v|
- h[v['k']] = v['v']
- h
+ a.find("//osm/relation/tag").sort_by { |v| v["k"] }.each_with_object({}) do |v, h|
+ h[v["k"]] = v["v"]
end
end
@@ -948,14 +962,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
##