X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e03ea17a227b09df70899b035680b51b3da2c61b..89c677d8819ed2087a9427fb234253c0fff56a55:/test/functional/relation_controller_test.rb
diff --git a/test/functional/relation_controller_test.rb b/test/functional/relation_controller_test.rb
index 8f8b72770..ffd65f6cc 100644
--- a/test/functional/relation_controller_test.rb
+++ b/test/functional/relation_controller_test.rb
@@ -6,9 +6,6 @@ class RelationController; def rescue_action(e) raise e end; end
class RelationControllerTest < Test::Unit::TestCase
api_fixtures
- fixtures :relations, :current_relations, :relation_members, :current_relation_members, :relation_tags, :current_relation_tags
- set_fixture_class :current_relations => :Relation
- set_fixture_class :relations => :OldRelation
def setup
@controller = RelationController.new
@@ -21,7 +18,7 @@ class RelationControllerTest < Test::Unit::TestCase
end
def content(c)
- @request.env["RAW_POST_DATA"] = c
+ @request.env["RAW_POST_DATA"] = c.to_s
end
# -------------------------------------
@@ -45,6 +42,9 @@ class RelationControllerTest < Test::Unit::TestCase
get :relations_for_node, :id => current_nodes(:node_used_by_relationship).id
assert_response :success
# FIXME check whether this contains the stuff we want!
+ # see the test_read in way_controller_test.rb for the assert_select
+ assert_select "osm[version=#{API_VERSION}][generator=\"OpenStreetMap server\"]", 1
+ assert_select "osm relation"
if $VERBOSE
print @response.body
end
@@ -57,7 +57,6 @@ class RelationControllerTest < Test::Unit::TestCase
print @response.body
end
-
# check the "relations for relation" mode
get :relations_for_relation, :id => current_relations(:used_relation).id
assert_response :success
@@ -81,9 +80,12 @@ class RelationControllerTest < Test::Unit::TestCase
def test_create
basic_authorization "test@openstreetmap.org", "test"
+
+ # put the relation in a dummy fixture changset
+ changeset_id = changesets(:normal_user_first_change).id
# create an relation without members
- content ""
+ content ""
put :create
# hope for success
assert_response :success,
@@ -98,7 +100,9 @@ class RelationControllerTest < Test::Unit::TestCase
"saved relation contains members but should not"
assert_equal checkrelation.tags.length, 1,
"saved relation does not contain exactly one tag"
- assert_equal users(:normal_user).id, checkrelation.user_id,
+ 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,
"saved relation does not belong to user that created it"
assert_equal true, checkrelation.visible,
"saved relation is not visible"
@@ -109,8 +113,9 @@ class RelationControllerTest < Test::Unit::TestCase
# create an relation with a node as member
nid = current_nodes(:used_node_1).id
- content "" +
- ""
+ content "" +
+ "" +
+ ""
put :create
# hope for success
assert_response :success,
@@ -125,7 +130,9 @@ class RelationControllerTest < Test::Unit::TestCase
"saved relation does not contain exactly one member"
assert_equal checkrelation.tags.length, 1,
"saved relation does not contain exactly one tag"
- assert_equal users(:normal_user).id, checkrelation.user_id,
+ 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,
"saved relation does not belong to user that created it"
assert_equal true, checkrelation.visible,
"saved relation is not visible"
@@ -137,9 +144,10 @@ class RelationControllerTest < Test::Unit::TestCase
# 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 "" +
- "" +
- ""
+ content "" +
+ "" +
+ "" +
+ ""
put :create
# hope for success
assert_response :success,
@@ -154,7 +162,9 @@ class RelationControllerTest < Test::Unit::TestCase
"saved relation does not have exactly two members"
assert_equal checkrelation.tags.length, 1,
"saved relation does not contain exactly one tag"
- assert_equal users(:normal_user).id, checkrelation.user_id,
+ 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,
"saved relation does not belong to user that created it"
assert_equal true, checkrelation.visible,
"saved relation is not visible"
@@ -171,8 +181,13 @@ class RelationControllerTest < Test::Unit::TestCase
def test_create_invalid
basic_authorization "test@openstreetmap.org", "test"
+ # put the relation in a dummy fixture changset
+ changeset_id = changesets(:normal_user_first_change).id
+
# create a relation with non-existing node as member
- content ""
+ content "" +
+ "" +
+ ""
put :create
# expect failure
assert_response :precondition_failed,
@@ -184,8 +199,6 @@ class RelationControllerTest < Test::Unit::TestCase
# -------------------------------------
def test_delete
- return true
-
# first try to delete relation without auth
delete :delete, :id => current_relations(:visible_relation).id
assert_response :unauthorized
@@ -193,17 +206,77 @@ class RelationControllerTest < Test::Unit::TestCase
# now set auth
basic_authorization("test@openstreetmap.org", "test");
- # this should work
+ # this shouldn't work, as we should need the payload...
+ delete :delete, :id => current_relations(:visible_relation).id
+ assert_response :bad_request
+
+ # try to delete without specifying a changeset
+ content ""
+ delete :delete, :id => current_relations(:visible_relation).id
+ assert_response :conflict
+
+ # try to delete with an invalid (closed) changeset
+ content update_changeset(current_relations(:visible_relation).to_xml,
+ changesets(:normal_user_closed_change).id)
+ delete :delete, :id => current_relations(:visible_relation).id
+ assert_response :conflict
+
+ # try to delete with an invalid (non-existent) changeset
+ content update_changeset(current_relations(:visible_relation).to_xml,0)
+ delete :delete, :id => current_relations(:visible_relation).id
+ assert_response :conflict
+
+ # this won't work because the relation is in-use by another relation
+ content(relations(:used_relation).to_xml)
+ delete :delete, :id => current_relations(:used_relation).id
+ assert_response :precondition_failed,
+ "shouldn't be able to delete a relation used in a relation (#{@response.body})"
+
+ # this should work when we provide the appropriate payload...
+ content(relations(:visible_relation).to_xml)
delete :delete, :id => current_relations(:visible_relation).id
assert_response :success
+ # valid delete should return the new version number, which should
+ # be greater than the old version number
+ assert @response.body.to_i > current_relations(:visible_relation).version,
+ "delete request should return a new version number for relation"
+
# this won't work since the relation is already deleted
+ content(relations(:invisible_relation).to_xml)
delete :delete, :id => current_relations(:invisible_relation).id
assert_response :gone
+ # this works now because the relation which was using this one
+ # has been deleted.
+ content(relations(:used_relation).to_xml)
+ delete :delete, :id => current_relations(:used_relation).id
+ assert_response :success,
+ "should be able to delete a relation used in an old relation (#{@response.body})"
+
# this won't work since the relation never existed
delete :delete, :id => 0
assert_response :not_found
end
+ ##
+ # update the changeset_id of a node element
+ def update_changeset(xml, changeset_id)
+ xml_attr_rewrite(xml, 'changeset', changeset_id)
+ end
+
+ ##
+ # update an attribute in the node element
+ def xml_attr_rewrite(xml, name, value)
+ xml.find("//osm/relation").first[name] = value.to_s
+ return xml
+ end
+
+ ##
+ # parse some xml
+ def xml_parse(xml)
+ parser = XML::Parser.new
+ parser.string = xml
+ parser.parse
+ end
end