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

Refactor remaining relation model tests to use factories.

Browse source
This commit is contained in:
Andy Allan 2017-05-31 14:59:11 +01:00
parent f735b07309
commit e9fa94bce2
1 changed files with 35 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

50
test/models/relation_test.rb
View file

@ -104,31 +104,45 @@ class RelationTest < ActiveSupport::TestCase
end
def test_relation_members
relation = current_relations(:relation_with_versions)
relation = create(:relation)
node = create(:node)
way = create(:way)
other_relation = create(:relation)
create(:relation_member, :relation => relation, :member => node, :member_role => "some node")
create(:relation_member, :relation => relation, :member => way, :member_role => "some way")
create(:relation_member, :relation => relation, :member => other_relation, :member_role => "some relation")
members = Relation.find(relation.id).relation_members
assert_equal 3, members.count
assert_equal "some node", members[0].member_role
assert_equal "Node", members[0].member_type
assert_equal 15, members[0].member_id
assert_equal node.id, members[0].member_id
assert_equal "some way", members[1].member_role
assert_equal "Way", members[1].member_type
assert_equal 4, members[1].member_id
assert_equal way.id, members[1].member_id
assert_equal "some relation", members[2].member_role
assert_equal "Relation", members[2].member_type
assert_equal 7, members[2].member_id
assert_equal other_relation.id, members[2].member_id
end
def test_relations
relation = current_relations(:relation_with_versions)
relation = create(:relation)
node = create(:node)
way = create(:way)
other_relation = create(:relation)
create(:relation_member, :relation => relation, :member => node, :member_role => "some node")
create(:relation_member, :relation => relation, :member => way, :member_role => "some way")
create(:relation_member, :relation => relation, :member => other_relation, :member_role => "some relation")
members = Relation.find(relation.id).members
assert_equal 3, members.count
assert_equal ["Node", 15, "some node"], members[0]
assert_equal ["Way", 4, "some way"], members[1]
assert_equal ["Relation", 7, "some relation"], members[2]
assert_equal ["Node", node.id, "some node"], members[0]
assert_equal ["Way", way.id, "some way"], members[1]
assert_equal ["Relation", other_relation.id, "some relation"], members[2]
end
def test_relation_tags
relation = current_relations(:relation_with_versions)
relation = create(:relation)
taglist = create_list(:relation_tag, 2, :relation => relation)
tags = Relation.find(relation.id).relation_tags.order(:k)
@ -140,7 +154,7 @@ class RelationTest < ActiveSupport::TestCase
end
def test_tags
relation = current_relations(:relation_with_versions)
relation = create(:relation)
taglist = create_list(:relation_tag, 2, :relation => relation)
tags = Relation.find(relation.id).tags
@ -151,19 +165,25 @@ class RelationTest < ActiveSupport::TestCase
end
def test_containing_relation_members
relation = current_relations(:used_relation)
relation = create(:relation)
super_relation = create(:relation)
create(:relation_member, :relation => super_relation, :member => relation)
crm = Relation.find(relation.id).containing_relation_members.order(:relation_id)
# assert_equal 1, crm.size
assert_equal 1, crm.first.relation_id
assert_equal super_relation.id, crm.first.relation_id
assert_equal "Relation", crm.first.member_type
assert_equal relation.id, crm.first.member_id
assert_equal 1, crm.first.relation.id
assert_equal super_relation.id, crm.first.relation.id
end
def test_containing_relations
relation = current_relations(:used_relation)
relation = create(:relation)
super_relation = create(:relation)
create(:relation_member, :relation => super_relation, :member => relation)
cr = Relation.find(relation.id).containing_relations.order(:id)
assert_equal 1, cr.size
assert_equal 1, cr.first.id
assert_equal super_relation.id, cr.first.id
end
end