Merge pull request #3446 from nationalarchives/Fix_e2e_test

Update error message for the date field when it is empty
nationalarchives · Nov 1, 2023 · 28def34 · 28def34
2 parents be50c31 + f7d1aff
commit 28def34
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/app/controllers/util/FormField.scala b/app/controllers/util/FormField.scala
@@ -323,18 +323,19 @@ object DateField {
     val fieldName = if (dateField.getAlternativeName == "Advisory Council Approval") dateField.fieldAlternativeName else dateField.getAlternativeName.toLowerCase
 
     errorCode match {
-      case EMPTY_VALUE_ERROR_FOR_DAY | EMPTY_VALUE_ERROR => dateField.copy(fieldErrors = List(emptyValueError.format(fieldName, "day")))
-      case NUMBER_ERROR_FOR_DAY                          => dateField.copy(fieldErrors = List(wholeNumberError2.format("day", fieldName, wholeNumberExample)))
-      case NEGATIVE_NUMBER_ERROR_FOR_DAY                 => dateField.copy(fieldErrors = List(negativeNumberError.format("day")))
-      case INVALID_NUMBER_ERROR_FOR_DAY                  => dateField.copy(fieldErrors = List(invalidDateError.format("day", fieldName, "31")))
-      case EMPTY_VALUE_ERROR_FOR_MONTH                   => dateField.copy(fieldErrors = List(emptyValueError.format(fieldName, "month")))
-      case NUMBER_ERROR_FOR_MONTH                        => dateField.copy(fieldErrors = List(wholeNumberError2.format("month", fieldName, "3, 9, 12")))
-      case NEGATIVE_NUMBER_ERROR_FOR_MONTH               => dateField.copy(fieldErrors = List(negativeNumberError.format("month")))
-      case INVALID_NUMBER_ERROR_FOR_MONTH                => dateField.copy(fieldErrors = List(invalidDateError.format("month", fieldName, "12")))
-      case EMPTY_VALUE_ERROR_FOR_YEAR                    => dateField.copy(fieldErrors = List(emptyValueError.format(fieldName, "year")))
-      case NUMBER_ERROR_FOR_YEAR                         => dateField.copy(fieldErrors = List(wholeNumberError2.format("year", fieldName, "1994, 2000, 2023")))
-      case NEGATIVE_NUMBER_ERROR_FOR_YEAR                => dateField.copy(fieldErrors = List(negativeNumberError.format("year")))
-      case INVALID_NUMBER_ERROR_FOR_YEAR                 => dateField.copy(fieldErrors = List(invalidYearError.format(fieldName)))
+      case EMPTY_VALUE_ERROR               => dateField.copy(fieldErrors = List(dateNotEnteredError.format(fieldName)))
+      case EMPTY_VALUE_ERROR_FOR_DAY       => dateField.copy(fieldErrors = List(emptyValueError.format(fieldName, "day")))
+      case NUMBER_ERROR_FOR_DAY            => dateField.copy(fieldErrors = List(wholeNumberError2.format("day", fieldName, wholeNumberExample)))
+      case NEGATIVE_NUMBER_ERROR_FOR_DAY   => dateField.copy(fieldErrors = List(negativeNumberError.format("day")))
+      case INVALID_NUMBER_ERROR_FOR_DAY    => dateField.copy(fieldErrors = List(invalidDateError.format("day", fieldName, "31")))
+      case EMPTY_VALUE_ERROR_FOR_MONTH     => dateField.copy(fieldErrors = List(emptyValueError.format(fieldName, "month")))
+      case NUMBER_ERROR_FOR_MONTH          => dateField.copy(fieldErrors = List(wholeNumberError2.format("month", fieldName, "3, 9, 12")))
+      case NEGATIVE_NUMBER_ERROR_FOR_MONTH => dateField.copy(fieldErrors = List(negativeNumberError.format("month")))
+      case INVALID_NUMBER_ERROR_FOR_MONTH  => dateField.copy(fieldErrors = List(invalidDateError.format("month", fieldName, "12")))
+      case EMPTY_VALUE_ERROR_FOR_YEAR      => dateField.copy(fieldErrors = List(emptyValueError.format(fieldName, "year")))
+      case NUMBER_ERROR_FOR_YEAR           => dateField.copy(fieldErrors = List(wholeNumberError2.format("year", fieldName, "1994, 2000, 2023")))
+      case NEGATIVE_NUMBER_ERROR_FOR_YEAR  => dateField.copy(fieldErrors = List(negativeNumberError.format("year")))
+      case INVALID_NUMBER_ERROR_FOR_YEAR   => dateField.copy(fieldErrors = List(invalidYearError.format(fieldName)))
       case INVALID_DAY_FOR_MONTH_ERROR =>
         val day = dateField.day.value.toInt
         val month = dateField.month.value.toInt

diff --git a/test/controllers/util/FormFieldSpec.scala b/test/controllers/util/FormFieldSpec.scala
@@ -564,7 +564,7 @@ class FormFieldSpec extends AnyWordSpec with MockitoSugar with BeforeAndAfterEac
 
     "updateError should set an error message as per the given error code" in {
 
-      DateField.updateError(mandatoryDateField, EMPTY_VALUE_ERROR).fieldErrors shouldBe List("The alternativename must contain a day")
+      DateField.updateError(mandatoryDateField, EMPTY_VALUE_ERROR).fieldErrors shouldBe List("Enter the alternativename for this record")
       DateField.updateError(mandatoryDateField, EMPTY_VALUE_ERROR_FOR_DAY).fieldErrors shouldBe List("The alternativename must contain a day")
       DateField.updateError(mandatoryDateField, NUMBER_ERROR_FOR_DAY).fieldErrors shouldBe List("The day of the alternativename must be a whole number, like 3, 15, 21")
       DateField.updateError(mandatoryDateField, NEGATIVE_NUMBER_ERROR_FOR_DAY).fieldErrors shouldBe List("The day cannot be a negative number")