From 043847ae6ee406235b0bca4bc4ea73b48796cdc0 Mon Sep 17 00:00:00 2001 From: simon lehericey Date: Thu, 5 Mar 2020 16:41:08 +0100 Subject: [PATCH] change notify_automatic_deletion_to_administration signature --- app/mailers/dossier_mailer.rb | 12 ++++++------ spec/mailers/dossier_mailer_spec.rb | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/mailers/dossier_mailer.rb b/app/mailers/dossier_mailer.rb index c2294ee67..96ae6b1b3 100644 --- a/app/mailers/dossier_mailer.rb +++ b/app/mailers/dossier_mailer.rb @@ -69,26 +69,26 @@ class DossierMailer < ApplicationMailer mail(to: user.email, subject: @subject) end - def notify_automatic_deletion_to_user(user, dossier_hashes) + def notify_automatic_deletion_to_user(email, dossier_hashes) @subject = default_i18n_subject(count: dossier_hashes.count) @dossier_hashes = dossier_hashes - mail(to: user.email, subject: @subject) + mail(to: email, subject: @subject) end - def notify_automatic_deletion_to_administration(user, dossier_hashes) + def notify_automatic_deletion_to_administration(email, dossier_hashes) @subject = default_i18n_subject(count: dossier_hashes.count) @dossier_hashes = dossier_hashes - mail(to: user.email, subject: @subject) + mail(to: email, subject: @subject) end - def notify_en_construction_near_deletion(user, dossiers, for_user) + def notify_en_construction_near_deletion(email, dossiers, for_user) @subject = default_i18n_subject(count: dossiers.count) @dossiers = dossiers @for_user = for_user - mail(to: user.email, subject: @subject) + mail(to: email, subject: @subject) end def notify_groupe_instructeur_changed(instructeur, dossier) diff --git a/spec/mailers/dossier_mailer_spec.rb b/spec/mailers/dossier_mailer_spec.rb index c18b2ebb4..4dec70856 100644 --- a/spec/mailers/dossier_mailer_spec.rb +++ b/spec/mailers/dossier_mailer_spec.rb @@ -104,8 +104,9 @@ RSpec.describe DossierMailer, type: :mailer do @date_suppression = dossier.created_at + duree.months end - subject { described_class.notify_automatic_deletion_to_user(dossier.user, [dossier.hash_for_deletion_mail]) } + subject { described_class.notify_automatic_deletion_to_user(dossier.user.email, [dossier.hash_for_deletion_mail]) } + it { expect(subject.to).to eq([dossier.user.email]) } it { expect(subject.subject).to eq("Un dossier a été supprimé automatiquement") } it { expect(subject.body).to include("n° #{dossier.id} ") } it { expect(subject.body).to include(dossier.procedure.libelle) } @@ -129,7 +130,7 @@ RSpec.describe DossierMailer, type: :mailer do @date_suppression = dossier.created_at + duree.months end - subject { described_class.notify_en_construction_near_deletion(dossier.user, [dossier], true) } + subject { described_class.notify_en_construction_near_deletion(dossier.user.email, [dossier], true) } it { expect(subject.subject).to eq("Un dossier en construction va bientôt être supprimé") } it { expect(subject.body).to include("n° #{dossier.id} ") } @@ -146,8 +147,9 @@ RSpec.describe DossierMailer, type: :mailer do @date_suppression = dossier.created_at + duree.months end - subject { described_class.notify_en_construction_near_deletion(dossier.user, [dossier], false) } + subject { described_class.notify_en_construction_near_deletion(dossier.user.email, [dossier], false) } + it { expect(subject.to).to eq([dossier.user.email]) } it { expect(subject.subject).to eq("Un dossier en construction va bientôt être supprimé") } it { expect(subject.body).to include("n° #{dossier.id} ") } it { expect(subject.body).to include(dossier.procedure.libelle) }