fixed 'deletion of all services' email bug [#149521941]

app/lib/notifier_logic.rb

@@ -85,7 +85,11 @@ def send_admin_notifications(sub_service_requests, request_amendment: false, ssr
       audit_report = request_amendment ? sub_service_request.audit_line_items(@current_user) : nil
       sub_service_request.organization.submission_emails_lookup.each do |submission_email|
         individual_ssr = @sub_service_request.present? ? true : false
-        Notifier.delay.notify_admin(submission_email.email, @current_user, sub_service_request, audit_report, ssr_destroyed, individual_ssr)
+        if ssr_destroyed
+          Notifier.notify_admin(submission_email.email, @current_user, sub_service_request, audit_report, ssr_destroyed, individual_ssr).deliver_now
+        else
+          Notifier.delay.notify_admin(submission_email.email, @current_user, sub_service_request, audit_report, ssr_destroyed, individual_ssr)
+        end
       end
     end
   end
@@ -179,7 +183,11 @@ def send_service_provider_notifications(sub_service_requests, request_amendment:
 
   def send_individual_service_provider_notification(sub_service_request, service_provider, audit_report=nil, ssr_destroyed=false, request_amendment=false)
     individual_ssr = @sub_service_request.present? ? true : false
-    Notifier.delay.notify_service_provider(service_provider, @service_request, @current_user, sub_service_request, audit_report, ssr_destroyed, request_amendment, individual_ssr)
+    if ssr_destroyed
+      Notifier.notify_service_provider(service_provider, @service_request, @current_user, sub_service_request, audit_report, ssr_destroyed, request_amendment, individual_ssr).deliver_now
+    else
+      Notifier.delay.notify_service_provider(service_provider, @service_request, @current_user, sub_service_request, audit_report, ssr_destroyed, request_amendment, individual_ssr)
+    end
   end
 
   def filter_audit_trail(identity, ssr_ids_that_need_auditing)

spec/lib/notifier_logic/ssr_deletion_emails_spec.rb

@@ -29,14 +29,6 @@
 
   let(:logged_in_user)          { Identity.first }
 
-  before :each do
-    Delayed::Worker.delay_jobs = false
-  end
-
-  after :each do
-    Delayed::Worker.delay_jobs = true
-  end
-
   context '#ssr_deletion_emails(ssr, ssr_destroyed: true, request_amendment: false) for an entire SR' do
     context 'deleted an entire SSR' do
       before :each do
@@ -70,7 +62,7 @@
       it 'should not notify authorized users (deletion email)' do
         allow(Notifier).to receive(:notify_user) do
           mailer = double('mail') 
-          expect(mailer).to receive(:deliver)
+          expect(mailer).to receive(:deliver_now)
           mailer
         end
 
@@ -81,7 +73,7 @@
       it 'should notify service providers (deletion email)' do
         allow(Notifier).to receive(:notify_service_provider) do
           mailer = double('mail') 
-          expect(mailer).to receive(:deliver)
+          expect(mailer).to receive(:deliver_now)
           mailer
         end
 
@@ -92,7 +84,7 @@
       it 'should notify admin (deletion email)' do
         allow(Notifier).to receive(:notify_admin) do
           mailer = double('mail') 
-          expect(mailer).to receive(:deliver)
+          expect(mailer).to receive(:deliver_now)
           mailer
         end 
 
@@ -117,4 +109,4 @@ def delete_entire_ssr(sr, ssr, ssr2)
 
     sr.previous_submitted_at = sr.submitted_at
   end
-end
+end