Tests

spec/mailers/dossier_mailer_spec.rb

@@ -86,18 +86,6 @@ RSpec.describe DossierMailer, type: :mailer do
     it { expect(subject.body).to include(deleted_dossier.procedure.libelle) }
   end
 
-  describe '.notify_revert_to_instruction' do
-    let(:dossier) { create(:dossier, procedure: create(:simple_procedure)) }
-
-    subject { described_class.notify_revert_to_instruction(dossier) }
-
-    it { expect(subject.subject).to include('réexaminé') }
-    it { expect(subject.body).to include(dossier.procedure.libelle) }
-    it { expect(subject.body).to include(dossier_url(dossier)) }
-
-    it_behaves_like 'a dossier notification'
-  end
-
   describe '.notify_brouillon_near_deletion' do
     let(:dossier) { create(:dossier) }
 

spec/models/dossier_spec.rb

@@ -1177,7 +1177,7 @@ describe Dossier, type: :model do
     it 'creates a commentaire in the messagerie with expected wording' do
       passer_en_instruction
 
-      email_template = dossier.procedure.mail_template_for(Dossier.states.fetch(:en_instruction))
+      email_template = dossier.procedure.mail_template_for(dossier)
       commentaire = dossier.commentaires.last
 
       expect(commentaire.body).to include(email_template.subject_for_dossier(dossier), email_template.body_for_dossier(dossier))
@@ -1634,8 +1634,7 @@ describe Dossier, type: :model do
 
     before do
       Timecop.freeze
-      allow(DossierMailer).to receive(:notify_revert_to_instruction)
-        .and_return(double(deliver_later: true))
+      allow(NotificationMailer).to receive(:send_repasser_en_instruction_notification).and_return(double(deliver_later: true))
       dossier.repasser_en_instruction!(instructeur: instructeur)
       dossier.reload
     end
@@ -1650,7 +1649,7 @@ describe Dossier, type: :model do
     it { expect(dossier.termine_close_to_expiration_notice_sent_at).to be_nil }
     it { expect(last_operation.operation).to eq('repasser_en_instruction') }
     it { expect(last_operation.data['author']['email']).to eq(instructeur.email) }
-    it { expect(DossierMailer).to have_received(:notify_revert_to_instruction).with(dossier) }
+    it { expect(NotificationMailer).to have_received(:send_repasser_en_instruction_notification).with(dossier) }
 
     after { Timecop.return }
   end

spec/models/procedure_spec.rb

@@ -7,6 +7,7 @@ describe Procedure do
     it { expect(subject.closed_mail_template).to be_a(Mails::ClosedMail) }
     it { expect(subject.refused_mail_template).to be_a(Mails::RefusedMail) }
     it { expect(subject.without_continuation_mail_template).to be_a(Mails::WithoutContinuationMail) }
+    it { expect(subject.re_instructed_mail_template).to be_a(Mails::ReInstructedMail) }
   end
 
   describe 'compute_dossiers_count' do