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

Assign proper sequence numbers to relation members in tests

Browse source
This commit is contained in:
Tom Hughes 2023-10-10 21:35:00 +01:00
parent 4f542ef900
commit ee3f045495
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/controllers/api/relations_controller_test.rb
View file

@ -102,7 +102,7 @@ module Api
second_relation = create(:relation_member, :member => node).relation second_relation = create(:relation_member, :member => node).relation
_super_relation = create(:relation_member, :member => second_relation).relation _super_relation = create(:relation_member, :member => second_relation).relation
# should combine multiple relation_member references into just one relation entry # should combine multiple relation_member references into just one relation entry
create(:relation_member, :member => node, :relation => relation_with_node, :sequence_id => 2) create(:relation_member, :member => node, :relation => relation_with_node)
# should not include deleted relations # should not include deleted relations
deleted_relation = create(:relation, :deleted) deleted_relation = create(:relation, :deleted)
create(:relation_member, :member => node, :relation => deleted_relation) create(:relation_member, :member => node, :relation => deleted_relation)
@ -122,7 +122,7 @@ module Api
second_relation = create(:relation_member, :member => way).relation second_relation = create(:relation_member, :member => way).relation
_super_relation = create(:relation_member, :member => second_relation).relation _super_relation = create(:relation_member, :member => second_relation).relation
# should combine multiple relation_member references into just one relation entry # should combine multiple relation_member references into just one relation entry
create(:relation_member, :member => way, :relation => relation_with_way, :sequence_id => 2) create(:relation_member, :member => way, :relation => relation_with_way)
# should not include deleted relations # should not include deleted relations
deleted_relation = create(:relation, :deleted) deleted_relation = create(:relation, :deleted)
create(:relation_member, :member => way, :relation => deleted_relation) create(:relation_member, :member => way, :relation => deleted_relation)
@ -142,7 +142,7 @@ module Api
second_relation = create(:relation_member, :member => relation).relation second_relation = create(:relation_member, :member => relation).relation
_super_relation = create(:relation_member, :member => second_relation).relation _super_relation = create(:relation_member, :member => second_relation).relation
# should combine multiple relation_member references into just one relation entry # should combine multiple relation_member references into just one relation entry
create(:relation_member, :member => relation, :relation => relation_with_relation, :sequence_id => 2) create(:relation_member, :member => relation, :relation => relation_with_relation)
# should not include deleted relations # should not include deleted relations
deleted_relation = create(:relation, :deleted) deleted_relation = create(:relation, :deleted)
create(:relation_member, :member => relation, :relation => deleted_relation) create(:relation_member, :member => relation, :relation => deleted_relation)

1
test/factories/old_relation_member.rb
View file

@ -1,5 +1,6 @@
FactoryBot.define do FactoryBot.define do
factory :old_relation_member do factory :old_relation_member do
sequence(:sequence_id)
member_role { "" } member_role { "" }
old_relation old_relation

1
test/factories/relation_member.rb
View file

@ -1,5 +1,6 @@
FactoryBot.define do FactoryBot.define do
factory :relation_member do factory :relation_member do
sequence(:sequence_id)
member_role { "" } member_role { "" }
relation relation