Merge branch 'main-broker-address-lookup' into feat/EMS-4054

UK-Export-Finance · Jan 15, 2025 · adc1e89 · adc1e89
2 parents 0ef15e4 + 6f3b9d8
commit adc1e89
Show file tree

Hide file tree

Showing 29 changed files with 504 additions and 131 deletions.
diff --git a/e2e-tests/commands/insurance/check-policy-summary-list.js b/e2e-tests/commands/insurance/check-policy-summary-list.js
@@ -28,6 +28,8 @@ const {
     NAME_ON_POLICY: { NAME, POSITION },
     USING_BROKER,
     BROKER_DETAILS,
+    BROKER_ADDRESSES,
+    BROKER_MANUAL_ADDRESS,
     REQUESTED_JOINTLY_INSURED_PARTY: { REQUESTED, COMPANY_NAME, COMPANY_NUMBER, COUNTRY_CODE },
     LOSS_PAYEE: { IS_APPOINTED: LOSS_PAYEE_IS_APPOINTED },
     LOSS_PAYEE_DETAILS: { NAME: LOSS_PAYEE_NAME },
@@ -231,22 +233,30 @@ const checkPolicySummaryList = {
 
       cy.assertSummaryListRow(summaryList, fieldId, expectedKey, expectedValue, expectedChangeLinkText);
     },
-    // TODO: EMS-4011
-    // [BROKER_DETAILS.FULL_ADDRESS]: () => {
-    //   const fieldId = BROKER_DETAILS.FULL_ADDRESS;
+    [BROKER_ADDRESSES.SELECT_THE_ADDRESS]: () => {
+      const fieldId = BROKER_ADDRESSES.SELECT_THE_ADDRESS;
 
-    //   const expectedKey = FIELDS.BROKER_DETAILS[fieldId].SUMMARY.TITLE;
+      const expectedKey = FIELDS.BROKER_ADDRESSES[fieldId].SUMMARY.TITLE;
 
-    //   const row = summaryList.field(fieldId);
+      const row = summaryList.field(fieldId);
 
-    //   cy.checkText(row.key(), expectedKey);
+      cy.checkText(row.key(), expectedKey);
 
-    //   row.value().contains(EXPECTED_SINGLE_LINE_STRING);
+      row.value().contains(EXPECTED_SINGLE_LINE_STRING);
 
-    //   const expectedLineBreaks = 3;
+      const expectedLineBreaks = 3;
 
-    //   cy.assertLength(row.valueHtmlLineBreak(), expectedLineBreaks);
-    // },
+      cy.assertLength(row.valueHtmlLineBreak(), expectedLineBreaks);
+    },
+    [BROKER_MANUAL_ADDRESS.FULL_ADDRESS]: () => {
+      const fieldId = BROKER_MANUAL_ADDRESS.FULL_ADDRESS;
+
+      const { expectedKey, expectedChangeLinkText } = getSummaryListField(fieldId, FIELDS.BROKER_MANUAL_ADDRESS);
+
+      const expectedValue = application.BROKER[fieldId];
+
+      cy.assertSummaryListRow(summaryList, fieldId, expectedKey, expectedValue, expectedChangeLinkText);
+    },
     [BROKER_DETAILS.EMAIL]: () => {
       const fieldId = BROKER_DETAILS.NAME;
 

diff --git a/e2e-tests/constants/routes/insurance/policy/broker.js b/e2e-tests/constants/routes/insurance/policy/broker.js
@@ -18,10 +18,14 @@ const BROKER_ROUTES = {
   BROKER_DETAILS_CHECK_AND_CHANGE: `${BROKER_DETAILS_ROOT}/check-and-change`,
   BROKER_ADDRESSES_ROOT,
   BROKER_ADDRESSES_SAVE_AND_BACK: `${BROKER_ADDRESSES_ROOT}/save-and-back`,
+  BROKER_ADDRESSES_CHANGE: `${BROKER_ADDRESSES_ROOT}/change`,
+  BROKER_ADDRESSES_CHECK_AND_CHANGE: `${BROKER_ADDRESSES_ROOT}/check-and-change`,
   BROKER_CONFIRM_ADDRESS_ROOT,
   BROKER_ZERO_ADDRESSES_ROOT,
   BROKER_MANUAL_ADDRESS_ROOT,
   BROKER_MANUAL_ADDRESS_SAVE_AND_BACK: `${BROKER_MANUAL_ADDRESS_ROOT}/save-and-back`,
+  BROKER_MANUAL_ADDRESS_CHANGE: `${BROKER_MANUAL_ADDRESS_ROOT}/change`,
+  BROKER_MANUAL_ADDRESS_CHECK_AND_CHANGE: `${BROKER_MANUAL_ADDRESS_ROOT}/check-and-change`,
 };
 
 export default BROKER_ROUTES;
diff --git a/e2e-tests/content-strings/fields/insurance/policy/index.js b/e2e-tests/content-strings/fields/insurance/policy/index.js
@@ -286,6 +286,10 @@ export const POLICY_FIELDS = {
   BROKER_ADDRESSES: {
     [SELECT_THE_ADDRESS]: {
       LABEL: 'Select the address',
+      SUMMARY: {
+        TITLE: "Broker's address",
+        FORM_TITLE: POLICY_FORM_TITLES.BROKER,
+      },
     },
   },
   BROKER_MANUAL_ADDRESS: {

diff --git a/...-list/multiple-policy/check-your-answers-policy-multiple-with-broker-summary-list.spec.js b/...-list/multiple-policy/check-your-answers-policy-multiple-with-broker-summary-list.spec.js
@@ -9,7 +9,8 @@ const {
 
 const {
   USING_BROKER,
-  BROKER_DETAILS: { NAME, EMAIL, FULL_ADDRESS },
+  BROKER_DETAILS: { NAME, EMAIL },
+  BROKER_MANUAL_ADDRESS: { FULL_ADDRESS },
 } = POLICY_FIELD_IDS;
 
 const baseUrl = Cypress.config('baseUrl');
@@ -56,8 +57,7 @@ context('Insurance - Check your answers - Policy - Multiple contract policy - Wi
     checkSummaryList.BROKER[NAME]({});
   });
 
-  // TODO: EMS-4011
-  it.skip(`should render a ${FULL_ADDRESS} summary list row`, () => {
+  it(`should render a ${FULL_ADDRESS} summary list row`, () => {
     checkSummaryList.BROKER[FULL_ADDRESS]();
   });
 

diff --git a/...mary-list/single-policy/check-your-answers-policy-single-with-broker-summary-list.spec.js b/...mary-list/single-policy/check-your-answers-policy-single-with-broker-summary-list.spec.js
@@ -9,7 +9,8 @@ const {
 
 const {
   USING_BROKER,
-  BROKER_DETAILS: { NAME, EMAIL, FULL_ADDRESS },
+  BROKER_DETAILS: { NAME, EMAIL },
+  BROKER_MANUAL_ADDRESS: { FULL_ADDRESS },
 } = POLICY_FIELD_IDS;
 
 const baseUrl = Cypress.config('baseUrl');
@@ -56,8 +57,7 @@ context('Insurance - Check your answers - Policy - Single contract policy - With
     checkSummaryList.BROKER[NAME]({});
   });
 
-  // TODO: EMS-3976
-  it.skip(`should render a ${FULL_ADDRESS} summary list row`, () => {
+  it(`should render a ${FULL_ADDRESS} summary list row`, () => {
     checkSummaryList.BROKER[FULL_ADDRESS]();
   });
 

diff --git a/...ance/cypress/e2e/journeys/policy/broker-manual-address/broker-manual-address-page.spec.js b/...ance/cypress/e2e/journeys/policy/broker-manual-address/broker-manual-address-page.spec.js
@@ -15,100 +15,100 @@ const {
 
 const {
   ROOT,
-  POLICY: { BROKER_MANUAL_ADDRESS_ROOT, LOSS_PAYEE_ROOT },
+  POLICY: { BROKER_DETAILS_ROOT, BROKER_MANUAL_ADDRESS_ROOT, LOSS_PAYEE_ROOT },
 } = INSURANCE_ROUTES;
 
 const { BROKER_MANUAL_ADDRESS: FIELD_STRINGS } = FIELDS;
 
 const baseUrl = Cypress.config('baseUrl');
 
-context('Insurance - Policy - Broker manual address page - As an exporter, ... TODO', () => {
-  let referenceNumber;
-  let url;
-  let lossPayeeUrl;
+context(
+  "Insurance - Policy - Broker manual address page - As an exporter, I want to provide UKEF with my broker's details So that UKEF can communicate with the broker as needed whilst processing my application",
+  () => {
+    let referenceNumber;
+    let url;
+    let lossPayeeUrl;
 
-  before(() => {
-    cy.completeSignInAndGoToApplication({}).then(({ referenceNumber: refNumber }) => {
-      referenceNumber = refNumber;
+    before(() => {
+      cy.completeSignInAndGoToApplication({}).then(({ referenceNumber: refNumber }) => {
+        referenceNumber = refNumber;
 
-      // go to the page we want to test.
-      cy.completeAndSubmitPolicyForms({ stopSubmittingAfter: 'brokerDetails', usingBroker: true });
+        // go to the page we want to test.
+        cy.completeAndSubmitPolicyForms({ stopSubmittingAfter: 'brokerDetails', usingBroker: true, isBasedInUk: false });
 
-      url = `${baseUrl}${ROOT}/${referenceNumber}${BROKER_MANUAL_ADDRESS_ROOT}`;
-      lossPayeeUrl = `${baseUrl}${ROOT}/${referenceNumber}${LOSS_PAYEE_ROOT}`;
+        url = `${baseUrl}${ROOT}/${referenceNumber}${BROKER_MANUAL_ADDRESS_ROOT}`;
+        lossPayeeUrl = `${baseUrl}${ROOT}/${referenceNumber}${LOSS_PAYEE_ROOT}`;
 
-      // TODO: EMS-3973 - remove this
-      cy.navigateToUrl(url);
-
-      cy.assertUrl(url);
-    });
-  });
-
-  beforeEach(() => {
-    cy.saveSession();
-  });
-
-  after(() => {
-    cy.deleteApplication(referenceNumber);
-  });
-
-  it('renders core page elements', () => {
-    cy.corePageChecks({
-      pageTitle: CONTENT_STRINGS.PAGE_TITLE,
-      currentHref: `${ROOT}/${referenceNumber}${BROKER_MANUAL_ADDRESS_ROOT}`,
-      backLink: `${ROOT}/${referenceNumber}${BROKER_MANUAL_ADDRESS_ROOT}#`,
+        cy.assertUrl(url);
+      });
     });
-  });
 
-  describe('page tests', () => {
     beforeEach(() => {
-      cy.navigateToUrl(url);
+      cy.saveSession();
     });
 
-    it('renders a heading caption', () => {
-      cy.checkText(headingCaption(), CONTENT_STRINGS.HEADING_CAPTION);
+    after(() => {
+      cy.deleteApplication(referenceNumber);
     });
 
-    it('renders intro text', () => {
-      cy.checkIntroText(CONTENT_STRINGS.INTRO);
+    it('renders core page elements', () => {
+      cy.corePageChecks({
+        pageTitle: CONTENT_STRINGS.PAGE_TITLE,
+        currentHref: `${ROOT}/${referenceNumber}${BROKER_MANUAL_ADDRESS_ROOT}`,
+        backLink: `${ROOT}/${referenceNumber}${BROKER_DETAILS_ROOT}`,
+      });
     });
 
-    it('renders `broker name` text', () => {
-      cy.checkText(brokerManualAddressPage.brokerName(), application.BROKER[NAME]);
-    });
+    describe('page tests', () => {
+      beforeEach(() => {
+        cy.navigateToUrl(url);
+      });
 
-    it(`renders ${FIELD_ID} textarea`, () => {
-      const fieldId = FIELD_ID;
-      const fieldStrings = FIELD_STRINGS[fieldId];
+      it('renders a heading caption', () => {
+        cy.checkText(headingCaption(), CONTENT_STRINGS.HEADING_CAPTION);
+      });
 
-      cy.assertTextareaRendering({
-        fieldId,
-        expectedLabel: fieldStrings.LABEL,
-        maximumCharacters: fieldStrings.MAXIMUM,
+      it('renders intro text', () => {
+        cy.checkIntroText(CONTENT_STRINGS.INTRO);
       });
-    });
-  });
 
-  describe('form submission', () => {
-    beforeEach(() => {
-      cy.navigateToUrl(url);
+      it('renders `broker name` text', () => {
+        cy.checkText(brokerManualAddressPage.brokerName(), application.BROKER[NAME]);
+      });
+
+      it(`renders ${FIELD_ID} textarea`, () => {
+        const fieldId = FIELD_ID;
+        const fieldStrings = FIELD_STRINGS[fieldId];
+
+        cy.assertTextareaRendering({
+          fieldId,
+          expectedLabel: fieldStrings.LABEL,
+          maximumCharacters: fieldStrings.MAXIMUM,
+        });
+      });
     });
 
-    it(`should redirect to ${LOSS_PAYEE_ROOT} page`, () => {
-      cy.completeAndSubmitBrokerManualAddressForm({});
+    describe('form submission', () => {
+      beforeEach(() => {
+        cy.navigateToUrl(url);
+      });
+
+      it(`should redirect to ${LOSS_PAYEE_ROOT} page`, () => {
+        cy.completeAndSubmitBrokerManualAddressForm({});
 
-      cy.assertUrl(lossPayeeUrl);
+        cy.assertUrl(lossPayeeUrl);
+      });
     });
-  });
 
-  describe('when going back to the page', () => {
-    it('should have the submitted value', () => {
-      cy.navigateToUrl(url);
+    describe('when going back to the page', () => {
+      it('should have the submitted value', () => {
+        cy.navigateToUrl(url);
 
-      cy.checkTextareaValue({
-        fieldId: FIELD_ID,
-        expectedValue: application.BROKER[FIELD_ID],
+        cy.checkTextareaValue({
+          fieldId: FIELD_ID,
+          expectedValue: application.BROKER[FIELD_ID],
+        });
       });
     });
-  });
-});
+  },
+);
diff --git a/e2e-tests/insurance/cypress/e2e/journeys/policy/broker-manual-address/save-and-back.spec.js b/e2e-tests/insurance/cypress/e2e/journeys/policy/broker-manual-address/save-and-back.spec.js
@@ -23,13 +23,10 @@ context('Insurance - Policy - Broker manual address page - Save and back', () =>
       referenceNumber = refNumber;
 
       // go to the page we want to test.
-      cy.completeAndSubmitPolicyForms({ stopSubmittingAfter: 'brokerDetails', usingBroker: true });
+      cy.completeAndSubmitPolicyForms({ stopSubmittingAfter: 'brokerDetails', usingBroker: true, isBasedInUk: false });
 
       url = `${baseUrl}${ROOT}/${referenceNumber}${BROKER_MANUAL_ADDRESS_ROOT}`;
 
-      // TODO: EMS-3973 - remove this
-      cy.navigateToUrl(url);
-
       cy.assertUrl(url);
     });
   });
@@ -76,8 +73,12 @@ context('Insurance - Policy - Broker manual address page - Save and back', () =>
     });
 
     it('should have the originally submitted answer selected when going back to the page after submission', () => {
-      // TODO: EMS-3973 - remove this, use cy.clickSubmitButtonMultipleTimes instead.
-      cy.navigateToUrl(url);
+      cy.navigateToAllSectionsUrl(referenceNumber);
+
+      cy.startInsurancePolicySection({});
+
+      // go through 8 policy forms.
+      cy.clickSubmitButtonMultipleTimes({ count: 8 });
 
       cy.checkTextareaValue({
         fieldId: FIELD_ID,

diff --git a/...journeys/policy/broker-manual-address/validation/broker-manual-address-validation.spec.js b/...journeys/policy/broker-manual-address/validation/broker-manual-address-validation.spec.js
@@ -30,13 +30,10 @@ context('Insurance - Policy - Broker manual address page - validation', () => {
       referenceNumber = refNumber;
 
       // go to the page we want to test.
-      cy.completeAndSubmitPolicyForms({ stopSubmittingAfter: 'brokerDetails', usingBroker: true });
+      cy.completeAndSubmitPolicyForms({ stopSubmittingAfter: 'brokerDetails', usingBroker: true, isBasedInUk: false });
 
       url = `${baseUrl}${ROOT}/${referenceNumber}${BROKER_MANUAL_ADDRESS_ROOT}`;
 
-      // TODO: EMS-3973 - remove this
-      cy.navigateToUrl(url);
-
       cy.assertUrl(url);
     });
   });

diff --git a/e2e-tests/shared-test-assertions/summary-lists/export-contract/fully-populated.js b/e2e-tests/shared-test-assertions/summary-lists/export-contract/fully-populated.js
@@ -51,8 +51,7 @@ const assertFullyPopulatedExportContractSummaryListRows = ({ agentChargeMethodFi
     checkSummaryList[NAME]({ shouldRender: true });
   });
 
-  // TODO: EMS-4011
-  it.skip(`should render a ${FULL_ADDRESS} summary list row`, () => {
+  it(`should render a ${FULL_ADDRESS} summary list row`, () => {
     checkSummaryList[FULL_ADDRESS]({ shouldRender: true });
   });
 

diff --git a/src/api/.keystone/config.js b/src/api/.keystone/config.js
diff --git a/src/api/content-strings/fields/insurance/policy/index.ts b/src/api/content-strings/fields/insurance/policy/index.ts
@@ -262,6 +262,10 @@ export const POLICY_FIELDS = {
   BROKER_ADDRESSES: {
     [SELECT_THE_ADDRESS]: {
       LABEL: 'Select the address',
+      SUMMARY: {
+        TITLE: "Broker's address",
+        FORM_TITLE: POLICY_FORM_TITLES.BROKER,
+      },
     },
   },
   BROKER_MANUAL_ADDRESS: {

diff --git a/src/ui/server/constants/routes/insurance/policy/broker.ts b/src/ui/server/constants/routes/insurance/policy/broker.ts
@@ -18,10 +18,14 @@ const BROKER_ROUTES = {
   BROKER_DETAILS_CHECK_AND_CHANGE: `${BROKER_DETAILS_ROOT}/check-and-change`,
   BROKER_ADDRESSES_ROOT,
   BROKER_ADDRESSES_SAVE_AND_BACK: `${BROKER_ADDRESSES_ROOT}/save-and-back`,
+  BROKER_ADDRESSES_CHANGE: `${BROKER_ADDRESSES_ROOT}/change`,
+  BROKER_ADDRESSES_CHECK_AND_CHANGE: `${BROKER_ADDRESSES_ROOT}/check-and-change`,
   BROKER_CONFIRM_ADDRESS_ROOT,
   BROKER_ZERO_ADDRESSES_ROOT,
   BROKER_MANUAL_ADDRESS_ROOT,
   BROKER_MANUAL_ADDRESS_SAVE_AND_BACK: `${BROKER_MANUAL_ADDRESS_ROOT}/save-and-back`,
+  BROKER_MANUAL_ADDRESS_CHANGE: `${BROKER_MANUAL_ADDRESS_ROOT}/change`,
+  BROKER_MANUAL_ADDRESS_CHECK_AND_CHANGE: `${BROKER_MANUAL_ADDRESS_ROOT}/check-and-change`,
 };
 
 export default BROKER_ROUTES;
diff --git a/src/ui/server/content-strings/fields/insurance/policy/index.ts b/src/ui/server/content-strings/fields/insurance/policy/index.ts
@@ -282,6 +282,10 @@ export const POLICY_FIELDS = {
   BROKER_ADDRESSES: {
     [SELECT_THE_ADDRESS]: {
       LABEL: 'Select the address',
+      SUMMARY: {
+        TITLE: "Broker's address",
+        FORM_TITLE: POLICY_FORM_TITLES.BROKER,
+      },
     },
   },
   BROKER_MANUAL_ADDRESS: {