Merge pull request #2002 from betagouv/frederic/fix-1999-store-AR-to-messagerie
Fix #1999 store AR to messagerie
This commit is contained in:
commit
8f390fa275
2 changed files with 3 additions and 7 deletions
|
@ -1,8 +1,6 @@
|
|||
class NotificationMailer < ApplicationMailer
|
||||
default to: Proc.new { @user.email }
|
||||
|
||||
after_action :create_commentaire_for_notification, only: [:send_notification, :send_dossier_received]
|
||||
|
||||
def send_dossier_received(dossier_id)
|
||||
dossier = Dossier.find(dossier_id)
|
||||
send_notification(dossier, dossier.procedure.received_mail_template)
|
||||
|
@ -20,10 +18,6 @@ class NotificationMailer < ApplicationMailer
|
|||
send_notification(dossier, dossier.procedure.initiated_mail_template)
|
||||
end
|
||||
|
||||
def send_received_notification(dossier)
|
||||
send_notification(dossier, dossier.procedure.received_mail_template)
|
||||
end
|
||||
|
||||
def send_closed_notification(dossier)
|
||||
send_notification(dossier, dossier.procedure.closed_mail_template)
|
||||
end
|
||||
|
@ -48,6 +42,8 @@ class NotificationMailer < ApplicationMailer
|
|||
@subject = mail_template.subject_for_dossier dossier
|
||||
@body = mail_template.body_for_dossier dossier
|
||||
|
||||
create_commentaire_for_notification
|
||||
|
||||
mail(subject: @subject) { |format| format.html { @body } }
|
||||
end
|
||||
|
||||
|
|
|
@ -246,7 +246,7 @@ describe NewUser::DossiersController, type: :controller do
|
|||
it { expect(flash.alert).to eq(['nop']) }
|
||||
|
||||
it 'does not send an email' do
|
||||
expect(NotificationMailer).not_to receive(:send_received_notification)
|
||||
expect(NotificationMailer).not_to receive(:send_initiated_notification)
|
||||
|
||||
subject
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue