Ensure email domain validation shows by default on page load within references form when referee email is invalid due to the domain being public

Author: Hassanmir92

app/controllers/teacher_interface/other_england_work_histories_controller.rb

@@ -242,6 +242,8 @@ def edit_contact
           contact_job: work_history.contact_job,
           contact_email: work_history.contact_email,
         )
+
+      @form.validate if @work_history.invalid_email_domain_for_contact?
     end
 
     def update_contact

app/controllers/teacher_interface/work_histories_controller.rb

@@ -211,6 +211,8 @@ def edit_contact
           contact_job: work_history.contact_job,
           contact_email: work_history.contact_email,
         )
+
+      @form.validate if @work_history.invalid_email_domain_for_contact?
     end
 
     def update_contact

spec/support/autoload/page_objects/teacher_interface/edit_other_england_work_history_contact.rb

@@ -12,6 +12,8 @@ class EditOtherEnglandWorkHistoryContact < SitePrism::Page
                 "#teacher-interface-work-history-contact-form-contact-job-field"
         element :email_input,
                 "#teacher-interface-work-history-contact-form-contact-email-field"
+        element :email_input_with_error,
+                "#teacher-interface-work-history-contact-form-contact-email-field-error"
 
         element :continue_button, ".govuk-button:not(.govuk-button--secondary)"
         element :save_and_come_back_later_button,

spec/support/autoload/page_objects/teacher_interface/edit_work_history_contact.rb

@@ -12,6 +12,8 @@ class EditWorkHistoryContact < SitePrism::Page
                 "#teacher-interface-work-history-contact-form-contact-job-field"
         element :email_input,
                 "#teacher-interface-work-history-contact-form-contact-email-field"
+        element :email_input_with_error,
+                "#teacher-interface-work-history-contact-form-contact-email-field-error"
 
         element :continue_button, ".govuk-button:not(.govuk-button--secondary)"
         element :save_and_come_back_later_button,

spec/system/teacher_interface/other_england_work_history_spec.rb

@@ -118,8 +118,9 @@
 
       when_i_click_the_other_england_work_history_task
       then_i_see_the(:teacher_edit_other_england_work_history_contact_page)
+      and_i_see_error_message_for_email_address_using_public_domain
 
-      when_i_fill_in_the_contact_information
+      when_i_update_the_contact_email_with_error
       then_i_see_the(:teacher_check_other_england_work_history_page)
 
       when_i_click_continue
@@ -256,6 +257,15 @@ def when_i_fill_in_the_contact_information
       .click
   end
 
+  def when_i_update_the_contact_email_with_error
+    teacher_edit_other_england_work_history_contact_page.form.email_input_with_error.fill_in with:
+      "contact@example.com"
+    teacher_edit_other_england_work_history_contact_page
+      .form
+      .continue_button
+      .click
+  end
+
   def and_i_see_the_other_england_work_history_information(name:)
     summary_list_rows = teacher_check_work_history_page.summary_list.rows
 
@@ -355,6 +365,12 @@ def when_i_delete_work_history
     teacher_delete_other_england_work_history_page.form.continue_button.click
   end
 
+  def and_i_see_error_message_for_email_address_using_public_domain
+    expect(teacher_edit_work_history_contact_page).to have_content(
+      "Enter an official email address that uses the institution’s domain",
+    )
+  end
+
   def teacher
     @teacher ||= create(:teacher)
   end

spec/system/teacher_interface/work_history_spec.rb

@@ -139,8 +139,9 @@
 
       when_i_click_the_work_history_task
       then_i_see_the(:teacher_edit_work_history_contact_page)
+      and_i_see_error_message_for_email_address_using_public_domain
 
-      when_i_fill_in_the_contact_information
+      when_i_update_the_contact_email_with_error
       then_i_see_the(:teacher_check_work_history_page)
 
       when_i_click_continue
@@ -347,6 +348,12 @@ def when_i_fill_in_the_contact_information
     teacher_edit_work_history_contact_page.form.continue_button.click
   end
 
+  def when_i_update_the_contact_email_with_error
+    teacher_edit_work_history_contact_page.form.email_input_with_error.fill_in with:
+      "contact@example.com"
+    teacher_edit_work_history_contact_page.form.continue_button.click
+  end
+
   def and_i_see_the_work_history_information
     summary_list_rows = teacher_check_work_history_page.summary_list.rows
 
@@ -583,6 +590,12 @@ def and_i_see_one_work_history
     expect(teacher_check_work_histories_page.summary_cards.count).to eq(1)
   end
 
+  def and_i_see_error_message_for_email_address_using_public_domain
+    expect(teacher_edit_work_history_contact_page).to have_content(
+      "Enter an official email address that uses the institution’s domain",
+    )
+  end
+
   def teacher
     @teacher ||= create(:teacher)
   end