X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/eb1a69b880eb7e72cc891aa8c7defe327610f0fe..396f2e28dd27d514f7882c3918103b12764038de:/test/controllers/relation_controller_test.rb
diff --git a/test/controllers/relation_controller_test.rb b/test/controllers/relation_controller_test.rb
index 5f7516fd2..afdab1bf2 100644
--- a/test/controllers/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
require "relation_controller"
class RelationControllerTest < ActionController::TestCase
- api_fixtures
-
##
# test all routes which lead to this controller
def test_routes
@@ -52,11 +50,11 @@ class RelationControllerTest < ActionController::TestCase
def test_read
# check that a visible relation is returned properly
- get :read, :id => current_relations(:visible_relation).id
+ get :read, :id => create(:relation).id
assert_response :success
# check that an invisible relation is not returned
- get :read, :id => current_relations(:invisible_relation).id
+ get :read, :id => create(:relation, :deleted).id
assert_response :gone
# check chat a non-existent relation is not returned
@@ -153,10 +151,10 @@ class RelationControllerTest < ActionController::TestCase
get :full, :id => 999999
assert_response :not_found
- get :full, :id => current_relations(:invisible_relation).id
+ get :full, :id => create(:relation, :deleted).id
assert_response :gone
- get :full, :id => current_relations(:visible_relation).id
+ get :full, :id => create(:relation).id
assert_response :success
# FIXME: check whether this contains the stuff we want!
end
@@ -164,6 +162,12 @@ class RelationControllerTest < ActionController::TestCase
##
# test fetching multiple relations
def test_relations
+ relation1 = create(:relation)
+ relation2 = create(:relation, :deleted)
+ relation3 = create(:relation, :with_history, :version => 2)
+ relation4 = create(:relation, :with_history, :version => 2)
+ relation4.old_relations.find_by(:version => 1).redact!(create(:redaction))
+
# check error when no parameter provided
get :relations
assert_response :bad_request
@@ -173,18 +177,18 @@ class RelationControllerTest < ActionController::TestCase
assert_response :bad_request
# test a working call
- get :relations, :relations => "1,2,4,7"
+ get :relations, :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id}"
assert_response :success
assert_select "osm" do
assert_select "relation", :count => 4
- assert_select "relation[id='1'][visible='true']", :count => 1
- assert_select "relation[id='2'][visible='false']", :count => 1
- assert_select "relation[id='4'][visible='true']", :count => 1
- assert_select "relation[id='7'][visible='true']", :count => 1
+ assert_select "relation[id='#{relation1.id}'][visible='true']", :count => 1
+ assert_select "relation[id='#{relation2.id}'][visible='false']", :count => 1
+ assert_select "relation[id='#{relation3.id}'][visible='true']", :count => 1
+ assert_select "relation[id='#{relation4.id}'][visible='true']", :count => 1
end
# check error when a non-existent relation is included
- get :relations, :relations => "1,2,4,7,400"
+ get :relations, :relations => "#{relation1.id},#{relation2.id},#{relation3.id},#{relation4.id},400"
assert_response :not_found
end
@@ -373,16 +377,18 @@ class RelationControllerTest < ActionController::TestCase
# 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
- create_list(:relation_tag, 4, :relation => current_relations(:multi_tag_relation))
- cs_id = changesets(:public_user_first_change).id
+ user = create(:user)
+ changeset = create(:changeset, :user => user)
+ relation = create(:relation)
+ create_list(:relation_tag, 4, :relation => relation)
- with_relation(rel_id) do |rel|
+ basic_authorization user.email, "test"
+
+ with_relation(relation.id) do |rel|
# alter one of the tags
tag = rel.find("//osm/relation/tag").first
tag["v"] = "some changed value"
- update_changeset(rel, cs_id)
+ update_changeset(rel, changeset.id)
# check that the downloaded tags are the same as the uploaded tags...
new_version = with_update(rel) do |new_rel|
@@ -390,10 +396,10 @@ class RelationControllerTest < ActionController::TestCase
end
# check the original one in the current_* table again
- with_relation(rel_id) { |r| assert_tags_equal rel, r }
+ with_relation(relation.id) { |r| assert_tags_equal rel, r }
# now check the version in the history
- with_relation(rel_id, new_version) { |r| assert_tags_equal rel, r }
+ with_relation(relation.id, new_version) { |r| assert_tags_equal rel, r }
end
end
@@ -627,11 +633,18 @@ class RelationControllerTest < ActionController::TestCase
# when a relation's tag is modified then it should put the bounding
# box of all its members into the changeset.
def test_tag_modify_bounding_box
- # in current fixtures, relation 5 contains nodes 3 and 5 (node 3
- # indirectly via way 3), so the bbox should be [3,3,5,5].
+ relation = create(:relation)
+ node1 = create(:node, :lat => 3, :lon => 3)
+ node2 = create(:node, :lat => 5, :lon => 5)
+ way = create(:way)
+ create(:way_node, :way => way, :node => node1)
+ create(:relation_member, :relation => relation, :member => way)
+ create(:relation_member, :relation => relation, :member => node2)
+ # the relation contains nodes1 and node2 (node1
+ # indirectly via the way), so the bbox should be [3,3,5,5].
check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id|
# add a tag to an existing relation
- relation_xml = current_relations(:visible_relation).to_xml
+ relation_xml = relation.to_xml
relation_element = relation_xml.find("//osm/relation").first
new_tag = XML::Node.new("tag")
new_tag["k"] = "some_new_tag"
@@ -643,7 +656,7 @@ class RelationControllerTest < ActionController::TestCase
# upload the change
content relation_xml
- put :update, :id => current_relations(:visible_relation).id
+ put :update, :id => relation.id
assert_response :success, "can't update relation for tag/bbox test"
end
end
@@ -652,15 +665,19 @@ 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
- 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|
+ relation = create(:relation)
+ node1 = create(:node, :lat => 4, :lon => 4)
+ node2 = create(:node, :lat => 7, :lon => 7)
+ way1 = create(:way)
+ create(:way_node, :way => way1, :node => create(:node, :lat => 8, :lon => 8))
+ way2 = create(:way)
+ create(:way_node, :way => way2, :node => create(:node, :lat => 9, :lon => 9), :sequence_id => 1)
+ create(:way_node, :way => way2, :node => create(:node, :lat => 10, :lon => 10), :sequence_id => 2)
+
+ [node1, node2, way1, way2].each do |element|
bbox = element.bbox.to_unscaled
check_changeset_modify(bbox) do |changeset_id|
- relation_xml = Relation.find(relation_id).to_xml
+ 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
@@ -673,11 +690,11 @@ class RelationControllerTest < ActionController::TestCase
# upload the change
content relation_xml
- put :update, :id => current_relations(:visible_relation).id
+ put :update, :id => 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
+ get :read, :id => relation.id
assert_response :success, "can't read back the relation: #{@response.body}"
check_ordering(relation_xml, @response.body)
end
@@ -688,11 +705,17 @@ class RelationControllerTest < ActionController::TestCase
# remove a member from a relation and check the bounding box is
# only that element.
def test_remove_member_bounding_box
+ relation = create(:relation)
+ node1 = create(:node, :lat => 3, :lon => 3)
+ node2 = create(:node, :lat => 5, :lon => 5)
+ create(:relation_member, :relation => relation, :member => node1)
+ create(:relation_member, :relation => relation, :member => node2)
+
check_changeset_modify(BoundingBox.new(5, 5, 5, 5)) do |changeset_id|
# remove node 5 (5,5) from an existing relation
- relation_xml = current_relations(:visible_relation).to_xml
+ relation_xml = relation.to_xml
relation_xml
- .find("//osm/relation/member[@type='node'][@ref='5']")
+ .find("//osm/relation/member[@type='node'][@ref='#{node2.id}']")
.first.remove!
# update changeset ID to point to new changeset
@@ -700,7 +723,7 @@ class RelationControllerTest < ActionController::TestCase
# upload the change
content relation_xml
- put :update, :id => current_relations(:visible_relation).id
+ put :update, :id => relation.id
assert_response :success, "can't update relation for remove node/bbox test"
end
end
@@ -718,15 +741,15 @@ class RelationControllerTest < ActionController::TestCase
basic_authorization(user.email, "test")
- doc_str = <
-
-
-
-
-
-
-
+ doc_str = <
+
+
+
+
+
+
+
OSM
doc = XML::Parser.string(doc_str).parse
@@ -778,15 +801,15 @@ OSM
node1 = create(:node)
node2 = create(:node)
- doc_str = <
-
-
-
-
-
-
-
+ doc_str = <
+
+
+
+
+
+
+
OSM
doc = XML::Parser.string(doc_str).parse
@@ -821,15 +844,15 @@ OSM
node3 = create(:node)
node4 = create(:node)
- doc_str = <
-
-
-
-
-
-
-
+ doc_str = <
+
+
+
+
+
+
+
OSM
doc = XML::Parser.string(doc_str).parse
basic_authorization(user.email, "test")
@@ -856,8 +879,16 @@ OSM
# remove all the members from a relation. the result is pretty useless, but
# still technically valid.
def test_remove_all_members
+ relation = create(:relation)
+ node1 = create(:node, :lat => 3, :lon => 3)
+ node2 = create(:node, :lat => 5, :lon => 5)
+ way = create(:way)
+ create(:way_node, :way => way, :node => node1)
+ create(:relation_member, :relation => relation, :member => way)
+ create(:relation_member, :relation => relation, :member => node2)
+
check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id|
- relation_xml = current_relations(:visible_relation).to_xml
+ relation_xml = relation.to_xml
relation_xml
.find("//osm/relation/member")
.each(&:remove!)
@@ -867,9 +898,9 @@ OSM
# upload the change
content relation_xml
- put :update, :id => current_relations(:visible_relation).id
+ put :update, :id => relation.id
assert_response :success, "can't update relation for remove all members test"
- checkrelation = Relation.find(current_relations(:visible_relation).id)
+ checkrelation = Relation.find(relation.id)
assert_not_nil(checkrelation,
"uploaded relation not found in database after upload")
assert_equal(0, checkrelation.members.length,
@@ -905,7 +936,7 @@ OSM
# that the changeset bounding box is +bbox+.
def check_changeset_modify(bbox)
## First test with the private user to check that you get a forbidden
- basic_authorization(users(:normal_user).email, "test")
+ basic_authorization(create(:user, :data_public => false).email, "test")
# create a new changeset for this operation, so we are assured
# that the bounding box will be newly-generated.
@@ -916,7 +947,7 @@ OSM
end
## Now do the whole thing with the public user
- basic_authorization(users(:public_user).email, "test")
+ basic_authorization(create(:user).email, "test")
# create a new changeset for this operation, so we are assured
# that the bounding box will be newly-generated.
@@ -936,10 +967,10 @@ OSM
assert_response :success, "can't re-read changeset for modify test"
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.min_lon}']", 1, "Changeset min_lon wrong in #{@response.body}"
- assert_select "osm>changeset[min_lat='#{bbox.min_lat}']", 1, "Changeset min_lat wrong in #{@response.body}"
- assert_select "osm>changeset[max_lon='#{bbox.max_lon}']", 1, "Changeset max_lon wrong in #{@response.body}"
- assert_select "osm>changeset[max_lat='#{bbox.max_lat}']", 1, "Changeset max_lat wrong in #{@response.body}"
+ assert_select "osm>changeset[min_lon='#{format('%.7f', bbox.min_lon)}']", 1, "Changeset min_lon wrong in #{@response.body}"
+ assert_select "osm>changeset[min_lat='#{format('%.7f', bbox.min_lat)}']", 1, "Changeset min_lat wrong in #{@response.body}"
+ assert_select "osm>changeset[max_lon='#{format('%.7f', bbox.max_lon)}']", 1, "Changeset max_lon wrong in #{@response.body}"
+ assert_select "osm>changeset[max_lat='#{format('%.7f', bbox.max_lat)}']", 1, "Changeset max_lat wrong in #{@response.body}"
end
end