DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Revert "Merge pull request #7280 from betagouv/move_type_de_champ_v2"

Browse source 
This reverts commit 08b90b9173, reversing
changes made to bc9a90bd08.
This commit is contained in:
Paul Chavard 2022-05-11 20:03:33 +02:00
parent 08b90b9173
commit 08caa122dd
3 changed files with 29 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/models/procedure_presentation_and_revisions_spec.rb
View file

@ -41,7 +41,7 @@ describe ProcedurePresentation do
before do
created_tdc0 = procedure.draft_revision.add_type_de_champ(tdc0)
procedure.draft_revision.reload.move_type_de_champ(created_tdc0.stable_id, 0)
procedure.draft_revision.move_type_de_champ(created_tdc0.stable_id, 0)
procedure.publish_revision!
end

22
spec/models/procedure_revision_spec.rb
View file

@ -53,21 +53,21 @@ describe ProcedureRevision do
context 'with 4 types de champ publiques' do
it 'move down' do
expect(draft.types_de_champ_public.index(type_de_champ_public)).to eq(0)
type_de_champ_public.update(order_place: nil)
draft.move_type_de_champ(type_de_champ_public.stable_id, 2)
draft.reload
expect(draft.types_de_champ_public.index(type_de_champ_public)).to eq(2)
expect(draft.procedure.types_de_champ.index(type_de_champ_public)).to eq(2)
expect(draft.procedure.types_de_champ_for_procedure_presentation.not_repetition.index(type_de_champ_public)).to eq(2)
end
it 'move up' do
expect(draft.types_de_champ_public.index(last_type_de_champ)).to eq(3)
last_type_de_champ.update(order_place: nil)
draft.move_type_de_champ(last_type_de_champ.stable_id, 0)
draft.reload
expect(draft.types_de_champ_public.index(last_type_de_champ)).to eq(0)
expect(draft.procedure.types_de_champ.index(last_type_de_champ)).to eq(0)
expect(draft.procedure.types_de_champ_for_procedure_presentation.not_repetition.index(last_type_de_champ)).to eq(0)
end
end
@ -92,19 +92,17 @@ describe ProcedureRevision do
end
it 'move down' do
expect(draft.children_of(type_de_champ_repetition).index(second_child)).to eq(1)
expect(type_de_champ_repetition.types_de_champ.index(second_child)).to eq(1)
draft.move_type_de_champ(second_child.stable_id, 2)
expect(draft.children_of(type_de_champ_repetition).index(second_child)).to eq(2)
type_de_champ_repetition.reload
expect(type_de_champ_repetition.types_de_champ.index(second_child)).to eq(2)
end
it 'move up' do
expect(draft.children_of(type_de_champ_repetition).index(last_child)).to eq(2)
expect(type_de_champ_repetition.types_de_champ.index(last_child)).to eq(2)
draft.move_type_de_champ(last_child.stable_id, 0)
expect(draft.children_of(type_de_champ_repetition).index(last_child)).to eq(0)
type_de_champ_repetition.reload
expect(type_de_champ_repetition.types_de_champ.index(last_child)).to eq(0)
end
end
end