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

fix(dossier clone): always rebase cloned dossiers

Browse source
This commit is contained in:
Eric Leroy-Terquem 2023-09-19 17:25:00 +02:00
parent 6abd0f8db0
commit 5e4d96654f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/concerns/dossier_clone_concern.rb
View file

@ -107,9 +107,7 @@ module DossierCloneConcern
transaction do
cloned_dossier.save!(validate: !fork)
if fork
cloned_dossier.rebase!
end
cloned_dossier.rebase!
end
if fork

2
spec/models/concern/dossier_clone_concern_spec.rb
View file

@ -272,6 +272,7 @@ RSpec.describe DossierCloneConcern do
context 'with new revision' do
let(:added_champ) { forked_dossier.champs.find { _1.libelle == "Un nouveau champ text" } }
let(:removed_champ) { dossier.champs.find { _1.stable_id == 99 } }
let(:new_dossier) { dossier.clone }
before do
procedure.draft_revision.add_type_de_champ({
@ -284,6 +285,7 @@ RSpec.describe DossierCloneConcern do
it {
expect(dossier.revision_id).to eq(procedure.revisions.first.id)
expect(new_dossier.revision_id).to eq(procedure.published_revision.id)
expect(forked_dossier.revision_id).to eq(procedure.published_revision_id)
is_expected.to eq(added: [added_champ], updated: [], removed: [removed_champ])
}