X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/38e94c6baa987fe85b03bd92019326b275b35815..b5e28f092fd1620cbd1005e17bcf6b77e086a317:/test/functional/relation_controller_test.rb?ds=sidebyside
diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index 4baf810fe..19b3617fc 100644
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -77,11 +77,63 @@ class RelationControllerTest < ActionController::TestCase
# -------------------------------------
def test_create
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:normal_user).email, "test"
# put the relation in a dummy fixture changset
changeset_id = changesets(:normal_user_first_change).id
+ # create an relation without members
+ content ""
+ put :create
+ # hope for forbidden, due to user
+ assert_response :forbidden,
+ "relation upload should have failed with forbidden"
+
+ ###
+ # create an relation with a node as member
+ # 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,
+ "relation upload did not return forbidden status"
+
+ ###
+ # create an relation with a node as member, this time test that we don't
+ # 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,
+ "relation upload did not return forbidden status"
+
+ ###
+ # create an relation with a way and a node as members
+ 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,
+ "relation upload did not return success status"
+
+
+
+ ## Now try with the public user
+ basic_authorization users(:public_user).email, "test"
+
+ # put the relation in a dummy fixture changset
+ changeset_id = changesets(:public_user_first_change).id
+
# create an relation without members
content ""
put :create
@@ -100,7 +152,7 @@ class RelationControllerTest < ActionController::TestCase
"saved relation does not contain exactly one tag"
assert_equal changeset_id, checkrelation.changeset.id,
"saved relation does not belong in the changeset it was assigned to"
- assert_equal users(:normal_user).id, checkrelation.changeset.user_id,
+ assert_equal users(:public_user).id, checkrelation.changeset.user_id,
"saved relation does not belong to user that created it"
assert_equal true, checkrelation.visible,
"saved relation is not visible"
@@ -132,7 +184,7 @@ class RelationControllerTest < ActionController::TestCase
"saved relation does not contain exactly one tag"
assert_equal changeset_id, checkrelation.changeset.id,
"saved relation does not belong in the changeset it was assigned to"
- assert_equal users(:normal_user).id, checkrelation.changeset.user_id,
+ assert_equal users(:public_user).id, checkrelation.changeset.user_id,
"saved relation does not belong to user that created it"
assert_equal true, checkrelation.visible,
"saved relation is not visible"
@@ -165,7 +217,7 @@ class RelationControllerTest < ActionController::TestCase
"saved relation does not contain exactly one tag"
assert_equal changeset_id, checkrelation.changeset.id,
"saved relation does not belong in the changeset it was assigned to"
- assert_equal users(:normal_user).id, checkrelation.changeset.user_id,
+ assert_equal users(:public_user).id, checkrelation.changeset.user_id,
"saved relation does not belong to user that created it"
assert_equal true, checkrelation.visible,
"saved relation is not visible"
@@ -198,7 +250,7 @@ class RelationControllerTest < ActionController::TestCase
"saved relation does not contain exactly one tag"
assert_equal changeset_id, checkrelation.changeset.id,
"saved relation does not belong in the changeset it was assigned to"
- assert_equal users(:normal_user).id, checkrelation.changeset.user_id,
+ assert_equal users(:public_user).id, checkrelation.changeset.user_id,
"saved relation does not belong to user that created it"
assert_equal true, checkrelation.visible,
"saved relation is not visible"
@@ -217,6 +269,7 @@ class RelationControllerTest < ActionController::TestCase
# happen to the correct tables and the API gives sensible results.
# this is to test a case that gregory marler noticed and posted to
# josm-dev.
+ ## FIXME Move this to an integration test
def test_update_relation_tags
basic_authorization "test@example.com", "test"
rel_id = current_relations(:multi_tag_relation).id
@@ -247,7 +300,7 @@ class RelationControllerTest < ActionController::TestCase
# and the API gives sensible results. this is to test a case that
# gregory marler noticed and posted to josm-dev.
def test_update_relation_tags_via_upload
- basic_authorization "test@example.com", "test"
+ basic_authorization users(:public_user).email, "test"
rel_id = current_relations(:multi_tag_relation).id
cs_id = changesets(:public_user_first_change).id
@@ -275,10 +328,10 @@ class RelationControllerTest < ActionController::TestCase
# -------------------------------------
def test_create_invalid
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
# put the relation in a dummy fixture changset
- changeset_id = changesets(:normal_user_first_change).id
+ changeset_id = changesets(:public_user_first_change).id
# create a relation with non-existing node as member
content "" +
@@ -288,16 +341,17 @@ class RelationControllerTest < ActionController::TestCase
# expect failure
assert_response :precondition_failed,
"relation upload with invalid node did not return 'precondition failed'"
+ assert_equal "Precondition failed: Relation with id cannot be saved due to Node with id 0", @response.body
end
# -------------------------------------
# Test creating a relation, with some invalid XML
# -------------------------------------
def test_create_invalid_xml
- basic_authorization "test@openstreetmap.org", "test"
+ basic_authorization users(:public_user).email, "test"
# put the relation in a dummy fixture changeset that works
- changeset_id = changesets(:normal_user_first_change).id
+ changeset_id = changesets(:public_user_first_change).id
# create some xml that should return an error
content "" +
@@ -316,11 +370,12 @@ class RelationControllerTest < ActionController::TestCase
# -------------------------------------
def test_delete
- # first try to delete relation without auth
+ ## First try to delete relation without auth
delete :delete, :id => current_relations(:visible_relation).id
assert_response :unauthorized
- ## First try with the private user, to make sure that you get a forbidden
+
+ ## Then try with the private user, to make sure that you get a forbidden
basic_authorization(users(:normal_user).email, "test")
# this shouldn't work, as we should need the payload...
@@ -370,7 +425,7 @@ class RelationControllerTest < ActionController::TestCase
- # now set auth for the private user
+ ## now set auth for the public user
basic_authorization(users(:public_user).email, "test");
# this shouldn't work, as we should need the payload...
@@ -378,10 +433,10 @@ class RelationControllerTest < ActionController::TestCase
assert_response :bad_request
# try to delete without specifying a changeset
- content ""
+ content ""
delete :delete, :id => current_relations(:visible_relation).id
assert_response :bad_request
- assert_match(/You are missing the required changeset in the relation/, @response.body)
+ assert_match(/Changeset id is missing/, @response.body)
# try to delete with an invalid (closed) changeset
content update_changeset(current_relations(:visible_relation).to_xml,
@@ -411,6 +466,7 @@ class RelationControllerTest < ActionController::TestCase
delete :delete, :id => current_relations(:public_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 5 is used in relation 6.", @response.body
# this should work when we provide the appropriate payload...
content(relations(:multi_tag_relation).to_xml)
@@ -426,6 +482,11 @@ class RelationControllerTest < ActionController::TestCase
content(relations(:invisible_relation).to_xml)
delete :delete, :id => current_relations(:invisible_relation).id
assert_response :gone
+
+ # Public visible relation needs to be deleted
+ content(relations(:public_visible_relation).to_xml)
+ delete :delete, :id => current_relations(:public_visible_relation).id
+ assert_response :success
# this works now because the relation which was using this one
# has been deleted.
@@ -468,23 +529,36 @@ class RelationControllerTest < ActionController::TestCase
# add a member to a relation and check the bounding box is only that
# element.
def test_add_member_bounding_box
- check_changeset_modify([4,4,4,4]) do |changeset_id|
- # add node 4 (4,4) to an existing relation
- relation_xml = current_relations(:visible_relation).to_xml
- relation_element = relation_xml.find("//osm/relation").first
- new_member = XML::Node.new("member")
- new_member['ref'] = current_nodes(:used_node_2).id.to_s
- new_member['type'] = "node"
- new_member['role'] = "some_role"
- relation_element << new_member
+ relation_id = current_relations(:visible_relation).id
+
+ [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|
+ bbox = element.bbox.collect { |x| x / SCALE }
+ 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"
+ relation_element << new_member
- # update changeset ID to point to new changeset
- update_changeset(relation_xml, changeset_id)
+ # update changeset ID to point to new changeset
+ update_changeset(relation_xml, changeset_id)
- # upload the change
- content relation_xml
- put :update, :id => current_relations(:visible_relation).id
- assert_response :success, "can't update relation for add node/bbox test"
+ # upload the change
+ content relation_xml
+ put :update, :id => current_relations(:visible_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
+ assert_response :success, "can't read back the relation: #{@response.body}"
+ check_ordering(relation_xml, @response.body)
+ end
end
end
@@ -556,14 +630,18 @@ OSM
get :read, :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
+ assert_response :success, "can't read back version 2 of the relation #{relation_id}"
+ check_ordering(doc, @response.body)
+ end
end
##
# check that relations can contain duplicate members
def test_relation_member_duplicates
- ## First try with the private user
- basic_authorization(users(:normal_user).email, "test");
-
doc_str = <
@@ -576,35 +654,59 @@ OSM
OSM
doc = XML::Parser.string(doc_str).parse
+ ## First try with the private user
+ basic_authorization(users(:normal_user).email, "test");
+
content doc
put :create
assert_response :forbidden
-
## Now try with the public user
basic_authorization(users(:public_user).email, "test");
+ content doc
+ put :create
+ assert_response :success, "can't create a relation: #{@response.body}"
+ relation_id = @response.body.to_i
+
+ # get it back and check the ordering
+ get :read, :id => relation_id
+ assert_response :success, "can't read back the relation: #{relation_id}"
+ check_ordering(doc, @response.body)
+ end
+
+ ##
+ # test that the ordering of elements in the history is the same as in current.
+ def test_history_ordering
doc_str = <
-
-
+
+
OSM
doc = XML::Parser.string(doc_str).parse
+ basic_authorization(users(:public_user).email, "test");
content doc
put :create
assert_response :success, "can't create a relation: #{@response.body}"
relation_id = @response.body.to_i
- # get it back and check the ordering
+ # check the ordering in the current tables:
get :read, :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
+ assert_response :success, "can't read back version 1 of the relation: #{@response.body}"
+ check_ordering(doc, @response.body)
+ end
end
# ============================================================
@@ -665,12 +767,12 @@ OSM
with_controller(ChangesetController.new) do
get :read, :id => changeset_id
assert_response :success, "can't re-read changeset for modify test"
- assert_select "osm>changeset", 1
- assert_select "osm>changeset[id=#{changeset_id}]", 1
- assert_select "osm>changeset[min_lon=#{bbox[0].to_f}]", 1
- assert_select "osm>changeset[min_lat=#{bbox[1].to_f}]", 1
- assert_select "osm>changeset[max_lon=#{bbox[2].to_f}]", 1
- assert_select "osm>changeset[max_lat=#{bbox[3].to_f}]", 1
+ 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[0].to_f}]", 1, "Changeset min_lon wrong in #{@response.body}"
+ assert_select "osm>changeset[min_lat=#{bbox[1].to_f}]", 1, "Changeset min_lat wrong in #{@response.body}"
+ assert_select "osm>changeset[max_lon=#{bbox[2].to_f}]", 1, "Changeset max_lon wrong in #{@response.body}"
+ assert_select "osm>changeset[max_lat=#{bbox[3].to_f}]", 1, "Changeset max_lat wrong in #{@response.body}"
end
end