cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor some controller tests to use factories.

Browse source
This commit is contained in:
Andy Allan 2017-05-31 16:08:34 +01:00
parent e9fa94bce2
commit 56d990ff68
2 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

49
test/controllers/relation_controller_test.rb
View file

@ -52,11 +52,11 @@ class RelationControllerTest < ActionController::TestCase
def test_read def test_read
# check that a visible relation is returned properly # 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 assert_response :success
# check that an invisible relation is not returned # 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 assert_response :gone
# check chat a non-existent relation is not returned # check chat a non-existent relation is not returned
@ -153,10 +153,10 @@ class RelationControllerTest < ActionController::TestCase
get :full, :id => 999999 get :full, :id => 999999
assert_response :not_found assert_response :not_found
get :full, :id => current_relations(:invisible_relation).id get :full, :id => create(:relation, :deleted).id
assert_response :gone assert_response :gone
get :full, :id => current_relations(:visible_relation).id get :full, :id => create(:relation).id
assert_response :success assert_response :success
# FIXME: check whether this contains the stuff we want! # FIXME: check whether this contains the stuff we want!
end end
@ -629,11 +629,18 @@ class RelationControllerTest < ActionController::TestCase
# when a relation's tag is modified then it should put the bounding # when a relation's tag is modified then it should put the bounding
# box of all its members into the changeset. # box of all its members into the changeset.
def test_tag_modify_bounding_box def test_tag_modify_bounding_box
# in current fixtures, relation 5 contains nodes 3 and 5 (node 3 relation = create(:relation)
# indirectly via way 3), so the bbox should be [3,3,5,5]. 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| check_changeset_modify(BoundingBox.new(3, 3, 5, 5)) do |changeset_id|
# add a tag to an existing relation # 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 relation_element = relation_xml.find("//osm/relation").first
new_tag = XML::Node.new("tag") new_tag = XML::Node.new("tag")
new_tag["k"] = "some_new_tag" new_tag["k"] = "some_new_tag"
@ -645,7 +652,7 @@ class RelationControllerTest < ActionController::TestCase
# upload the change # upload the change
content relation_xml 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" assert_response :success, "can't update relation for tag/bbox test"
end end
end end
@ -694,11 +701,17 @@ class RelationControllerTest < ActionController::TestCase
# remove a member from a relation and check the bounding box is # remove a member from a relation and check the bounding box is
# only that element. # only that element.
def test_remove_member_bounding_box 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| check_changeset_modify(BoundingBox.new(5, 5, 5, 5)) do |changeset_id|
# remove node 5 (5,5) from an existing relation # remove node 5 (5,5) from an existing relation
relation_xml = current_relations(:visible_relation).to_xml relation_xml = relation.to_xml
relation_xml relation_xml
.find("//osm/relation/member[@type='node'][@ref='5']") .find("//osm/relation/member[@type='node'][@ref='#{node2.id}']")
.first.remove! .first.remove!
# update changeset ID to point to new changeset # update changeset ID to point to new changeset
@ -706,7 +719,7 @@ class RelationControllerTest < ActionController::TestCase
# upload the change # upload the change
content relation_xml 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" assert_response :success, "can't update relation for remove node/bbox test"
end end
end end
@ -862,8 +875,16 @@ OSM
# remove all the members from a relation. the result is pretty useless, but # remove all the members from a relation. the result is pretty useless, but
# still technically valid. # still technically valid.
def test_remove_all_members 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| 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 relation_xml
.find("//osm/relation/member") .find("//osm/relation/member")
.each(&:remove!) .each(&:remove!)
@ -873,9 +894,9 @@ OSM
# upload the change # upload the change
content relation_xml 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" 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, assert_not_nil(checkrelation,
"uploaded relation not found in database after upload") "uploaded relation not found in database after upload")
assert_equal(0, checkrelation.members.length, assert_equal(0, checkrelation.members.length,

10
test/controllers/search_controller_test.rb
View file

@ -68,10 +68,14 @@ class SearchControllerTest < ActionController::TestCase
## ##
# test searching relations # test searching relations
def test_search_relations def test_search_relations
[:visible_relation, :invisible_relation, :used_relation].each do |relation| first_relation = create(:relation)
create(:relation_tag, :relation => current_relations(relation), :k => "test", :v => "yes") deleted_relation = create(:relation)
third_relation = create(:relation)
[first_relation, deleted_relation, third_relation].each do |relation|
create(:relation_tag, :relation => relation, :k => "test", :v => "yes")
end end
create(:relation_tag, :relation => current_relations(:used_relation), :k => "name", :v => "Test Relation") create(:relation_tag, :relation => third_relation, :k => "name", :v => "Test Relation")
get :search_relations, :type => "test" get :search_relations, :type => "test"
assert_response :service_unavailable assert_response :service_unavailable