Replace mailer with notify: RenewalPendingPaymentEmailService

DEFRA · May 5, 2021 · f641c93 · f641c93
1 parent 18897c6
commit f641c93
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 339 deletions.
diff --git a/app/mailers/waste_carriers_engine/renewal_mailer.rb b/app/mailers/waste_carriers_engine/renewal_mailer.rb
diff --git a/app/models/concerns/waste_carriers_engine/can_use_renewing_registration_workflow.rb b/app/models/concerns/waste_carriers_engine/can_use_renewing_registration_workflow.rb
@@ -581,7 +581,7 @@ def send_renewal_pending_checks_email
     end
 
     def send_renewal_received_pending_payment_email
-      RenewalMailer.send_renewal_received_email(self).deliver_now
+      WasteCarriersEngine::Notify::RenewalPendingPaymentEmailService.run(registration: self)
     rescue StandardError => e
       Airbrake.notify(e, registration_no: reg_identifier) if defined?(Airbrake)
     end

diff --git a/...waste_carriers_engine/renewal_mailer/send_renewal_received_pending_payment_email.html.erb b/...waste_carriers_engine/renewal_mailer/send_renewal_received_pending_payment_email.html.erb
diff --git a/config/locales/mailers/renewal_mailer.en.yml b/config/locales/mailers/renewal_mailer.en.yml
diff --git a/spec/mailers/waste_carriers_engine/renewal_mailer_spec.rb b/spec/mailers/waste_carriers_engine/renewal_mailer_spec.rb
diff --git a/...s/waste_carriers_engine/renewing_registration_workflow/confirm_bank_transfer_form_spec.rb b/...s/waste_carriers_engine/renewing_registration_workflow/confirm_bank_transfer_form_spec.rb
@@ -17,7 +17,12 @@ module WasteCarriersEngine
           include_examples "has next transition", next_state: "renewal_received_pending_payment_form"
 
           it "sends a confirmation email after the 'next' event" do
-            expect { subject.next! }.to change { ActionMailer::Base.deliveries.count }.by(1)
+            expect(Notify::RenewalPendingPaymentEmailService)
+              .to receive(:run)
+              .with(registration: subject)
+              .once
+
+            subject.next!
           end
         end
 

diff --git a/spec/models/waste_carriers_engine/renewing_registration_workflow/worldpay_form_spec.rb b/spec/models/waste_carriers_engine/renewing_registration_workflow/worldpay_form_spec.rb
@@ -29,7 +29,13 @@ module WasteCarriersEngine
               include_examples "has next transition", next_state: "renewal_complete_form"
 
               it "does not send a confirmation email after the 'next' event" do
-                expect { subject.next! }.to_not change { ActionMailer::Base.deliveries.count }
+                # An older incarnation of this spec checked that ActionMailer
+                # did not send *any* emails.
+                # Here we check to see if the notification service has been invoked,
+                # which should tell us if *any* emails have been sent.
+                expect(Notifications::Client).not_to receive(:new)
+
+                subject.next!
               end
             end