diff --git a/app/controllers/backoffice/dossiers_controller.rb b/app/controllers/backoffice/dossiers_controller.rb index 205904f59..ad0f073be 100644 --- a/app/controllers/backoffice/dossiers_controller.rb +++ b/app/controllers/backoffice/dossiers_controller.rb @@ -123,8 +123,8 @@ class Backoffice::DossiersController < Backoffice::DossiersListController notice = "Dossier considéré comme sans suite." template = dossier.procedure.without_continuation_mail_template when "close" - dossier.attestation = dossier.build_attestation dossier.accepte! + dossier.attestation = dossier.build_attestation notice = "Dossier traité avec succès." template = dossier.procedure.closed_mail_template end diff --git a/app/controllers/new_gestionnaire/dossiers_controller.rb b/app/controllers/new_gestionnaire/dossiers_controller.rb index af2cead4c..1e45fe4ef 100644 --- a/app/controllers/new_gestionnaire/dossiers_controller.rb +++ b/app/controllers/new_gestionnaire/dossiers_controller.rb @@ -89,8 +89,8 @@ module NewGestionnaire notice = "Dossier considéré comme sans suite." template = procedure.without_continuation_mail_template when "accepter" - dossier.attestation = dossier.build_attestation dossier.accepte! + dossier.attestation = dossier.build_attestation notice = "Dossier traité avec succès." template = procedure.closed_mail_template end diff --git a/spec/controllers/backoffice/dossiers_controller_spec.rb b/spec/controllers/backoffice/dossiers_controller_spec.rb index 2194a915f..d817aebca 100644 --- a/spec/controllers/backoffice/dossiers_controller_spec.rb +++ b/spec/controllers/backoffice/dossiers_controller_spec.rb @@ -358,11 +358,15 @@ describe Backoffice::DossiersController, type: :controller do subject { post :process_dossier, params: { process_action: "close", dossier_id: dossier_id, dossier: { motivation: "Yallah" }}} before do + Timecop.freeze(DateTime.now) + expect_any_instance_of(AttestationTemplate) .to receive(:attestation_for) - .with(have_attributes(motivation: "Yallah")) + .with(have_attributes(motivation: "Yallah", processed_at: DateTime.now)) end + after { Timecop.return } + it { subject } end end diff --git a/spec/controllers/new_gestionnaire/dossiers_controller_spec.rb b/spec/controllers/new_gestionnaire/dossiers_controller_spec.rb index d53102803..2bb35d7a4 100644 --- a/spec/controllers/new_gestionnaire/dossiers_controller_spec.rb +++ b/spec/controllers/new_gestionnaire/dossiers_controller_spec.rb @@ -237,11 +237,15 @@ describe NewGestionnaire::DossiersController, type: :controller do end before do + Timecop.freeze(DateTime.now) + expect_any_instance_of(AttestationTemplate) .to receive(:attestation_for) - .with(have_attributes(motivation: "Yallah")) + .with(have_attributes(motivation: "Yallah", processed_at: DateTime.now)) end + after { Timecop.return } + it { subject } end end