Merge pull request #1484 from alphagov/theseanything/send-confirmation-emails

Send confirmation emails when config missing

Author: theseanything

app/mailers/form_submission_confirmation_mailer.rb

@@ -4,8 +4,8 @@ def send_confirmation_email(what_happens_next_markdown:, support_contact_details
 
     set_personalisation(
       title: mailer_options.title,
-      what_happens_next_text: what_happens_next_markdown,
-      support_contact_details:,
+      what_happens_next_text: what_happens_next_markdown.presence || default_what_happens_next_text,
+      support_contact_details: support_contact_details.presence || default_support_contact_details_text,
       submission_time: mailer_options.timestamp.strftime("%l:%M%P").strip,
       submission_date: I18n.l(mailer_options.timestamp, format: "%-d %B %Y"),
       # GOV.UK Notify's templates have conditionals, but only positive
@@ -26,6 +26,14 @@ def send_confirmation_email(what_happens_next_markdown:, support_contact_details
 
 private
 
+  def default_what_happens_next_text
+    I18n.t("mailer.submission_confirmation.default_what_happens_next")
+  end
+
+  def default_support_contact_details_text
+    I18n.t("mailer.submission_confirmation.default_support_contact_details")
+  end
+
   def make_notify_boolean(bool)
     bool ? "yes" : "no"
   end

app/services/form_submission_service.rb

@@ -45,11 +45,6 @@ def submit_using_form_submission_type
   end
 
   def submit_confirmation_email_to_user
-    unless @form.what_happens_next_markdown.present? && has_support_contact_details?
-      Rails.logger.info "Skipping sending confirmation email to user as what happens next and support contact details have not been set"
-      return nil
-    end
-
     mail = FormSubmissionConfirmationMailer.send_confirmation_email(
       what_happens_next_markdown: @form.what_happens_next_markdown,
       support_contact_details: formatted_support_details,

config/locales/cy.yml

@@ -421,6 +421,9 @@ cy:
       time: This form was submitted at %{time} on %{date}
       title: This is a completed “%{title}” form.
       title_preview: This is a test of the “%{title}” form.
+    submission_confirmation:
+      default_support_contact_details: The form’s contact details for support will appear here once they’ve been added.
+      default_what_happens_next: The form’s information about what happens next will appear here once it has been added.
   mode:
     phase_banner_tag_preview-archived: Archived preview
     phase_banner_tag_preview-draft: Draft preview

config/locales/en.yml

@@ -421,6 +421,9 @@ en:
       time: This form was submitted at %{time} on %{date}
       title: This is a completed “%{title}” form.
       title_preview: This is a test of the “%{title}” form.
+    submission_confirmation:
+      default_support_contact_details: The form’s contact details for support will appear here once they’ve been added.
+      default_what_happens_next: The form’s information about what happens next will appear here once it has been added.
   mode:
     phase_banner_tag_preview-archived: Archived preview
     phase_banner_tag_preview-draft: Draft preview

spec/mailers/form_submission_confirmation_mailer_spec.rb

@@ -68,6 +68,38 @@
       expect(mail.govuk_notify_personalisation[:support_contact_details]).to eq("Call: 0203 222 2222")
     end
 
+    context "when what happens next is missing" do
+      let(:what_happens_next_markdown) { nil }
+
+      it "uses placeholder text" do
+        expect(mail.govuk_notify_personalisation[:what_happens_next_text]).to eq(I18n.t("mailer.submission_confirmation.default_what_happens_next"))
+      end
+    end
+
+    context "when what happens next is blank" do
+      let(:what_happens_next_markdown) { "" }
+
+      it "uses placeholder text" do
+        expect(mail.govuk_notify_personalisation[:what_happens_next_text]).to eq(I18n.t("mailer.submission_confirmation.default_what_happens_next"))
+      end
+    end
+
+    context "when support contact details are missing" do
+      let(:support_contact_details) { nil }
+
+      it "uses placeholder text" do
+        expect(mail.govuk_notify_personalisation[:support_contact_details]).to eq(I18n.t("mailer.submission_confirmation.default_support_contact_details"))
+      end
+    end
+
+    context "when support contact details are blank" do
+      let(:support_contact_details) { "" }
+
+      it "uses placeholder text" do
+        expect(mail.govuk_notify_personalisation[:support_contact_details]).to eq(I18n.t("mailer.submission_confirmation.default_support_contact_details"))
+      end
+    end
+
     it "includes an email reference (mostly used to retrieve specific email in notify for e2e tests)" do
       expect(mail.govuk_notify_reference).to eq("for-my-ref")
     end

spec/services/form_submission_service_spec.rb

@@ -252,31 +252,6 @@
           expect(FormSubmissionConfirmationMailer).not_to have_received(:send_confirmation_email)
         end
       end
-
-      context "when form is draft" do
-        context "when form does not have 'what happens next details'" do
-          let(:what_happens_next_markdown) { nil }
-
-          it "does not call FormSubmissionConfirmationMailer" do
-            allow(FormSubmissionConfirmationMailer).to receive(:send_confirmation_email)
-            service.submit
-            expect(FormSubmissionConfirmationMailer).not_to have_received(:send_confirmation_email)
-          end
-        end
-
-        context "when form does not have any support details" do
-          let(:support_email) { nil }
-          let(:support_phone) { nil }
-          let(:support_url) { nil }
-          let(:support_url_text) { nil }
-
-          it "does not call FormSubmissionConfirmationMailer" do
-            allow(FormSubmissionConfirmationMailer).to receive(:send_confirmation_email)
-            service.submit
-            expect(FormSubmissionConfirmationMailer).not_to have_received(:send_confirmation_email)
-          end
-        end
-      end
     end
   end