update multiselect error message (#3438)

nationalarchives · Nov 2, 2023 · 0fa3e1b · 0fa3e1b
1 parent 28def34
commit 0fa3e1b
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/app/controllers/util/FormField.scala b/app/controllers/util/FormField.scala
@@ -144,7 +144,7 @@ case class DateField(
 }
 
 object FormField {
-  val dropdownOptionNotSelectedError = "Search for and select at least one %s"
+  val dropdownOptionNotSelectedError = "Select at least one %s"
   val invalidDropdownOptionSelectedError = "Option '%s' was not an option provided to the user."
   val emptyValueError = "The %s must contain a %s"
   val wholeNumberError = "The %s must be a whole number, like %s"

diff --git a/test/controllers/AddAdditionalMetadataControllerSpec.scala b/test/controllers/AddAdditionalMetadataControllerSpec.scala
@@ -301,7 +301,7 @@ class AddAdditionalMetadataControllerSpec extends FrontEndTestHelper {
       )
       addAdditionalMetadataPageAsString should include("""    <p class="govuk-error-message" id="error-FoiExemptionCode">
           |        <span class="govuk-visually-hidden">Error:</span>
-          |        Search for and select at least one FOI exemption code(s)
+          |        Select at least one FOI exemption code
           |    </p>""".stripMargin)
     }
 

diff --git a/test/controllers/AdditionalMetadataSummaryControllerSpec.scala b/test/controllers/AdditionalMetadataSummaryControllerSpec.scala
@@ -79,7 +79,7 @@ class AdditionalMetadataSummaryControllerSpec extends FrontEndTestHelper {
         ("Is the title closed?", "Yes"),
         ("Closure Period", "4 years"),
         ("Closure Start Date", "01/12/1990"),
-        ("FOI exemption code(s)", "1, 2 "),
+        ("FOI exemption code", "1, 2 "),
         ("Alternative Title2", "An alternative title ")
       )
 

diff --git a/test/controllers/util/DynamicFormUtilsSpec.scala b/test/controllers/util/DynamicFormUtilsSpec.scala
@@ -155,7 +155,7 @@ class DynamicFormUtilsSpec extends AnyFlatSpec with MockitoSugar with BeforeAndA
     val validatedForm = dynamicFormUtils.convertSubmittedValuesToFormFields(dynamicFormUtils.formAnswersWithValidInputNames)
     validatedForm.foreach {
       case multiSelectField: MultiSelectField =>
-        multiSelectField.fieldErrors should equal(List(s"Search for and select at least one ${multiSelectField.fieldName}"))
+        multiSelectField.fieldErrors should equal(List(s"Select at least one ${multiSelectField.fieldName}"))
       case _ =>
     }
   }

diff --git a/test/controllers/util/FormFieldSpec.scala b/test/controllers/util/FormFieldSpec.scala
@@ -247,7 +247,7 @@ class FormFieldSpec extends AnyWordSpec with MockitoSugar with BeforeAndAfterEac
 
     "validate should return an error when the given value is empty" in {
 
-      DropdownField.validate(None, dropdownField) shouldBe Some("Search for and select at least one name")
+      DropdownField.validate(None, dropdownField) shouldBe Some("Select at least one name")
     }
 
     "validate should return an error when the given value is not a valid option" in {
@@ -258,7 +258,7 @@ class FormFieldSpec extends AnyWordSpec with MockitoSugar with BeforeAndAfterEac
     }
 
     "updateError should set an error message as per the given error code" in {
-      DropdownField.updateError(dropdownField, EMPTY_VALUE_ERROR).fieldErrors shouldBe List("Search for and select at least one name")
+      DropdownField.updateError(dropdownField, EMPTY_VALUE_ERROR).fieldErrors shouldBe List("Select at least one name")
       DropdownField
         .updateError(dropdownField.copy(selectedOption = InputNameAndValue("Test", "Test").some), UNDEFINED_VALUE_ERROR)
         .fieldErrors shouldBe List("Option 'Test' was not an option provided to the user.")
@@ -295,7 +295,7 @@ class FormFieldSpec extends AnyWordSpec with MockitoSugar with BeforeAndAfterEac
 
     "validate should return an error when the given value is empty" in {
 
-      MultiSelectField.validate(Nil, multiSelectField) shouldBe Some("Search for and select at least one name")
+      MultiSelectField.validate(Nil, multiSelectField) shouldBe Some("Select at least one name")
     }
 
     "validate should return an error when the given value is not a valid option" in {
@@ -304,7 +304,7 @@ class FormFieldSpec extends AnyWordSpec with MockitoSugar with BeforeAndAfterEac
     }
 
     "updateError should set an error message as per the given error code" in {
-      MultiSelectField.updateError(multiSelectField, EMPTY_VALUE_ERROR).fieldErrors shouldBe List("Search for and select at least one name")
+      MultiSelectField.updateError(multiSelectField, EMPTY_VALUE_ERROR).fieldErrors shouldBe List("Select at least one name")
       MultiSelectField
         .updateError(multiSelectField.copy(selectedOption = List(InputNameAndValue("Test", "Test")).some), UNDEFINED_VALUE_ERROR)
         .fieldErrors shouldBe List("Option 'Test' was not an option provided to the user.")

diff --git a/test/testUtils/CheckFormPageElements.scala b/test/testUtils/CheckFormPageElements.scala
@@ -29,7 +29,7 @@ class CheckFormPageElements() {
       |        Number of years the record is closed from the closure start date
       |    </div>""",
     """        <label class="govuk-label govuk-label--m" for="inputmultiselect-FoiExemptionCode">
-      |           FOI exemption code(s)
+      |           FOI exemption code
       |         </label>""",
     """        <div id="inputmultiselect-FoiExemptionCode-hint" class="govuk-hint">
       |        Add one or more exemption code to this closure. Here is a <a target="_blank" href="https://www.legislation.gov.uk/ukpga/2000/36/contents">full list of FOI codes and their designated exemptions</a>

diff --git a/test/testUtils/DefaultMockFormOptions.scala b/test/testUtils/DefaultMockFormOptions.scala
@@ -155,15 +155,15 @@ object DefaultMockFormOptions {
       label = "mock code1",
       value = "mock code1",
       fieldType = "inputmultiselect",
-      errorMessage = "Search for and select at least one FOI exemption code(s)"
+      errorMessage = "Select at least one FOI exemption code"
     ),
     MockInputOption(
       name = "inputmultiselect-FoiExemptionCode",
       id = "inputmultiselect-FoiExemptionCode-1",
       label = "mock code2",
       value = "mock code2",
       fieldType = "inputmultiselect",
-      errorMessage = "Search for and select at least one FOI exemption code(s)"
+      errorMessage = "Select at least one FOI exemption code"
     ),
     MockInputOption(
       name = "inputradio-TitleClosed",

diff --git a/test/testUtils/FrontEndTestHelper.scala b/test/testUtils/FrontEndTestHelper.scala
@@ -535,7 +535,7 @@ trait FrontEndTestHelper extends PlaySpec with MockitoSugar with Injecting with
             ),
             Text
           ),
-          dp.DisplayProperties.Attributes("Name", Some("FOI exemption code(s)"), Text),
+          dp.DisplayProperties.Attributes("Name", Some("FOI exemption code"), Text),
           dp.DisplayProperties.Attributes("Guidance", Some("Search by typing an FOI Exemption code"), Text),
           dp.DisplayProperties.Attributes("Editable", Some("true"), Boolean),
           dp.DisplayProperties.Attributes("Group", Some("2"), Text),