tests

spec/controllers/instructeurs/dossiers_controller_spec.rb

@@ -766,7 +766,6 @@ describe Instructeurs::DossiersController, type: :controller do
       before do
         dossier.accepter!(instructeur: instructeur, motivation: "le dossier est correct")
         dossier.update!(hidden_by_user_at: Time.zone.now.beginning_of_day.utc)
-        allow(DossierMailer).to receive(:notify_instructeur_deletion_to_user).and_return(double(deliver_later: nil))
         subject
       end
 
@@ -775,10 +774,6 @@ describe Instructeurs::DossiersController, type: :controller do
         expect(DossierOperationLog.where(dossier_id: dossier.id).last.operation).to eq('supprimer')
       end
 
-      it 'send an email to the user' do
-        expect(DossierMailer).to have_received(:notify_instructeur_deletion_to_user).with(DeletedDossier.where(dossier_id: dossier.id).first, dossier.user.email)
-      end
-
       it 'add a record into deleted_dossiers table' do
         expect(DeletedDossier.where(dossier_id: dossier.id).count).to eq(1)
         expect(DeletedDossier.where(dossier_id: dossier.id).first.revision_id).to eq(dossier.revision_id)
@@ -794,7 +789,6 @@ describe Instructeurs::DossiersController, type: :controller do
     context 'when the instructeur want to delete a dossier with a decision and not hidden by user' do
       before do
         dossier.accepter!(instructeur: instructeur, motivation: "le dossier est correct")
-        allow(DossierMailer).to receive(:notify_instructeur_deletion_to_user).and_return(double(deliver_later: nil))
         subject
       end
 
@@ -803,10 +797,6 @@ describe Instructeurs::DossiersController, type: :controller do
         expect(DossierOperationLog.where(dossier_id: dossier.id).last.operation).not_to eq('supprimer')
       end
 
-      it 'does not send an email to the user' do
-        expect(DossierMailer).not_to have_received(:notify_instructeur_deletion_to_user).with(DeletedDossier.where(dossier_id: dossier.id).first, dossier.user.email)
-      end
-
       it 'add a record into deleted_dossiers table' do
         expect(DeletedDossier.where(dossier_id: dossier.id).count).to eq(0)
       end

spec/controllers/users/dossiers_controller_spec.rb

@@ -1008,7 +1008,6 @@ describe Users::DossiersController, type: :controller do
     shared_examples_for "the dossier can not be deleted" do
       it "doesn’t notify the deletion" do
         expect(DossierMailer).not_to receive(:notify_deletion_to_administration)
-        expect(DossierMailer).not_to receive(:notify_deletion_to_user)
         subject
       end
 
@@ -1024,7 +1023,6 @@ describe Users::DossiersController, type: :controller do
 
       it "notifies the user and the admin of the deletion" do
         expect(DossierMailer).to receive(:notify_deletion_to_administration).with(kind_of(DeletedDossier), dossier.procedure.administrateurs.first.email).and_return(double(deliver_later: nil))
-        expect(DossierMailer).to receive(:notify_deletion_to_user).with(kind_of(DeletedDossier), dossier.user.email).and_return(double(deliver_later: nil))
         subject
       end
 

spec/mailers/dossier_mailer_spec.rb

@@ -60,16 +60,11 @@ RSpec.describe DossierMailer, type: :mailer do
     it { expect(subject.perform_deliveries).to be_falsy }
   end
 
-  describe '.notify_deletion_to_user' do
-    let(:deleted_dossier) { build(:deleted_dossier) }
+  def notify_deletion_to_administration(deleted_dossier, to_email)
+    @subject = default_i18n_subject(dossier_id: deleted_dossier.dossier_id)
+    @deleted_dossier = deleted_dossier
 
-    subject { described_class.notify_deletion_to_user(deleted_dossier, to_email) }
-
-    it { expect(subject.subject).to eq("Votre dossier nº #{deleted_dossier.dossier_id} a bien été supprimé") }
-    it { expect(subject.body).to include("Votre dossier") }
-    it { expect(subject.body).to include(deleted_dossier.dossier_id) }
-    it { expect(subject.body).to include("a bien été supprimé") }
-    it { expect(subject.body).to include(deleted_dossier.procedure.libelle) }
+    mail(to: to_email, subject: @subject)
   end
 
   describe '.notify_deletion_to_administration' do

spec/models/dossier_spec.rb

@@ -799,7 +799,6 @@ describe Dossier do
     let(:reason) { :user_request }
 
     before do
-      allow(DossierMailer).to receive(:notify_deletion_to_user).and_return(double(deliver_later: nil))
       allow(DossierMailer).to receive(:notify_deletion_to_administration).and_return(double(deliver_later: nil))
     end
 
@@ -835,10 +834,6 @@ describe Dossier do
         expect(deleted_dossier.deleted_at).to be_present
       end
 
-      it 'notifies the user' do
-        expect(DossierMailer).to have_received(:notify_deletion_to_user).with(deleted_dossier, dossier.user.email)
-      end
-
       it 'records the operation in the log' do
         expect(last_operation.operation).to eq("supprimer")
         expect(last_operation.automatic_operation?).to be_falsey