From 0a00cb55f748e2071dfb898a67f8df6495ac42d7 Mon Sep 17 00:00:00 2001
From: Dominic Belcher <dominic.belcher@digital.cabinet-office.gov.uk>
Date: Tue, 10 Dec 2024 10:31:30 +0000
Subject: [PATCH] PP-13255 Add error summary to org details form

---
 .../organisation-details/edit-organisation-details.njk   | 7 +++++++
 .../organisation-details/organisation-details.cy.js      | 9 +++++++++
 2 files changed, 16 insertions(+)

diff --git a/app/views/simplified-account/settings/organisation-details/edit-organisation-details.njk b/app/views/simplified-account/settings/organisation-details/edit-organisation-details.njk
index b93fc1a17..4aa7b9825 100644
--- a/app/views/simplified-account/settings/organisation-details/edit-organisation-details.njk
+++ b/app/views/simplified-account/settings/organisation-details/edit-organisation-details.njk
@@ -10,6 +10,13 @@
     href: backLink
   }) if backLink }}
 
+  {% if errors %}
+    {{ govukErrorSummary({
+      titleText: "There is a problem",
+      errorList: errors.summary
+    }) }}
+  {% endif %}
+
   <h1 class="govuk-heading-l">Organisation details</h1>
 
   <p class="govuk-body govuk-!-margin-bottom-6 hint-and-body-width">Payment card schemes require the details of the organisation taking payment to be shown on payment pages.</p>
diff --git a/test/cypress/integration/simplified-account/service-settings/organisation-details/organisation-details.cy.js b/test/cypress/integration/simplified-account/service-settings/organisation-details/organisation-details.cy.js
index 66e4b2fb6..d36816740 100644
--- a/test/cypress/integration/simplified-account/service-settings/organisation-details/organisation-details.cy.js
+++ b/test/cypress/integration/simplified-account/service-settings/organisation-details/organisation-details.cy.js
@@ -226,6 +226,15 @@ describe('Organisation details settings', () => {
 
           cy.location('pathname').should('eq', `/simplified/service/${SERVICE_EXTERNAL_ID}/account/${ACCOUNT_TYPE}/settings/organisation-details/edit`)
 
+          cy.get('.govuk-error-summary')
+            .should('exist')
+            .should('contain', 'Organisation name must be 100 characters or fewer')
+            .should('contain', 'Enter a building and street')
+            .should('contain', 'Enter a town or city')
+            .should('contain', 'Enter a real postcode')
+            .should('contain', 'Enter a telephone number, like 01632 960 001, 07700 900 982 or +44 0808 157 0192')
+            .should('contain', 'Enter a valid website address')
+
           cy.get('#organisation-name-error').should('contain.text', 'Organisation name must be 100 characters or fewer')
           cy.get('#address-line1-error').should('contain.text', 'Enter a building and street')
           cy.get('#address-city-error').should('contain.text', 'Enter a town or city')