feat(DTFS2-7531): bump gov design library (#3684)

UK-Export-Finance · Dec 3, 2024 · 1e25bba · 1e25bba
1 parent 4fe6da4
commit 1e25bba
Show file tree

Hide file tree

Showing 101 changed files with 907 additions and 2,157 deletions.
diff --git a/e2e-tests/README.md b/e2e-tests/README.md
@@ -57,7 +57,7 @@ npx cypress run --spec "cypress/e2e/**/my-test.spec.js"
 
 ## Cypress configuration ⚙️
 
-Each test suite has its own `cypress.json` configuration file in its root directory. This JSON file contains URLs for the relevant UI and API endpoints.
+Each test suite has its own `cypress.config.js` file in its root directory. This JSON file contains URLs for the relevant UI and API endpoints.
 
 Additionally, it includes values for handling timeouts and retries: `pageLoadTimeout` and `retries`.
 

diff --git a/...press/e2e/journeys/maker-about-supply-contract/fill-in-about-financial-validation.spec.js b/...press/e2e/journeys/maker-about-supply-contract/fill-in-about-financial-validation.spec.js
@@ -29,9 +29,13 @@ context('about-buyer', () => {
 
     // prove the errors are on the about-financial page
     contractAboutFinancial.visit(deal);
-    partials.errorSummaryLinks().should('have.length', 2);
+
+    partials.errorSummaryLinks().should('have.length', 4);
+
     contractAboutFinancial.expectError('Supply Contract value is required');
     contractAboutFinancial.expectError('Supply Contract currency is required');
+    contractAboutFinancial.expectError('Supply Contract conversion rate is required for non-GBP currencies');
+    contractAboutFinancial.expectError('Supply Contract conversion date is required for non-GBP currencies');
 
     // fill in value + pick currency=GBP to clear validation warnings
     cy.keyboardInput(contractAboutFinancial.supplyContractValue(), '123.45');

diff --git a/...e2e/journeys/maker-about-supply-contract/fill-in-about-supply-contract-validation.spec.js b/...e2e/journeys/maker-about-supply-contract/fill-in-about-supply-contract-validation.spec.js
@@ -36,31 +36,50 @@ context('about-supply-contract', () => {
 
     contractAboutSupplier.visit(deal);
     contractAboutSupplier.supplierName().clear();
+
     contractAboutSupplier.nextPage().click();
+
     contractAboutBuyer.nextPage().click();
     contractAboutFinancial.preview().click();
 
-    partials.errorSummaryLinks().should('have.length', 18);
+    partials.errorSummaryLinks().should('have.length', 20);
 
     // prove validation of all non-conditional pieces
     contractAboutPreview.expectError('Supplier type is required');
     contractAboutPreview.expectError('Supplier name is required');
     contractAboutPreview.expectError('Supplier address line 1 is required');
+    contractAboutPreview.expectError('Supplier town is required for non-UK addresses');
+    contractAboutPreview.expectError('Supplier country is required');
     contractAboutPreview.expectError('Supplier correspondence address is required');
     contractAboutPreview.expectError('Industry Sector is required');
     contractAboutPreview.expectError('Industry Class is required');
     contractAboutPreview.expectError('SME type is required');
+    contractAboutPreview.expectError('Supply Contract Description is required');
+    contractAboutPreview.expectError('Guarantor/Indemnifier is required');
+    contractAboutPreview.expectError('Buyer name is required');
+    contractAboutPreview.expectError('Buyer country is required');
+    contractAboutPreview.expectError('Buyer address line 1 is required');
+    contractAboutPreview.expectError('Buyer town is required for non-UK addresses');
+    contractAboutPreview.expectError('Destination of Goods and Services is required');
+    contractAboutPreview.expectError('Supply Contract value is required');
+    contractAboutPreview.expectError('Supply Contract currency is required');
+    contractAboutPreview.expectError('Supply Contract conversion rate is required for non-GBP currencies');
+    contractAboutPreview.expectError('Supply Contract conversion date is required for non-GBP currencies');
 
     // prove the errors are on the about-supplier page
     contractAboutSupplier.visit(deal);
     contractAboutSupplier.expectError('Supplier type is required');
     contractAboutSupplier.expectError('Supplier name is required');
     contractAboutSupplier.expectError('Supplier address line 1 is required');
+    contractAboutSupplier.expectError('Supplier town is required for non-UK addresses');
+    contractAboutSupplier.expectError('Supplier country is required');
     contractAboutSupplier.expectError('Supplier correspondence address is required');
     contractAboutSupplier.expectError('Industry Sector is required');
     contractAboutSupplier.expectError('Industry Class is required');
     contractAboutSupplier.expectError('SME type is required');
-    contractAboutSupplier.expectError('Supplier town is required for non-UK addresses');
+    contractAboutSupplier.expectError('Supply Contract Description is required');
+
+    contractAboutSupplier.expectError('Guarantor/Indemnifier is required');
 
     // switch to UK country
     contractAboutSupplier.supplierAddress().country().select('GBR');

diff --git a/e2e-tests/portal/cypress/e2e/journeys/maker-bond/bond-details.spec.js b/e2e-tests/portal/cypress/e2e/journeys/maker-bond/bond-details.spec.js
@@ -46,8 +46,8 @@ context('Bond Details', () => {
 
       partials.errorSummaryLinks().should('have.length', TOTAL_REQUIRED_FORM_FIELDS);
 
-      pages.bondDetails.bondTypeInputErrorMessage().should('be.visible');
-      pages.bondDetails.facilityStageInputErrorMessage().should('be.visible');
+      cy.assertText(pages.bondDetails.bondTypeInputErrorMessage(), 'Error: Enter the Bond type');
+      cy.assertText(pages.bondDetails.facilityStageInputErrorMessage(), 'Error: Enter the Bond stage');
     });
   });
 

diff --git a/...ts/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/add-payment.spec.js b/...ts/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/add-payment.spec.js
@@ -155,7 +155,7 @@ context('PDC_RECONCILE users can add a payment to a report', () => {
 
     cy.contains('Premium payments').should('exist');
 
-    cy.assertText(premiumPaymentsTable.status(FEE_RECORD_ID_ONE), FEE_RECORD_STATUS.MATCH);
+    cy.assertText(premiumPaymentsTable.status(FEE_RECORD_ID_ONE), 'Match');
   });
 
   it('redirects user to premium payments tab with match success notification when taken to match whilst trying to add another payment', () => {
@@ -172,7 +172,7 @@ context('PDC_RECONCILE users can add a payment to a report', () => {
 
     cy.contains('Premium payments').should('exist');
 
-    cy.assertText(premiumPaymentsTable.status(FEE_RECORD_ID_ONE), FEE_RECORD_STATUS.MATCH);
+    cy.assertText(premiumPaymentsTable.status(FEE_RECORD_ID_ONE), 'Match');
 
     cy.assertText(premiumPaymentsTab.matchSuccessNotificationHeading(), 'Match payment recorded');
 

diff --git a/...e2e/journeys/utilisation-reports/report-reconciliation/add-to-an-existing-payment.spec.js b/...e2e/journeys/utilisation-reports/report-reconciliation/add-to-an-existing-payment.spec.js
@@ -108,7 +108,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can add fee records to existing paymen
 
       pages.utilisationReportPage.premiumPaymentsTab.getPaymentLink(PAYMENT_ID_ONE).should('contain', 'GBP 450.00');
 
-      cy.assertText(pages.utilisationReportPage.premiumPaymentsTab.premiumPaymentsTable.status(FEE_RECORD_ID_ONE), FEE_RECORD_STATUS.MATCH);
+      cy.assertText(pages.utilisationReportPage.premiumPaymentsTab.premiumPaymentsTable.status(FEE_RECORD_ID_ONE), 'Match');
     });
   });
 
@@ -166,7 +166,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can add fee records to existing paymen
 
       pages.utilisationReportPage.premiumPaymentsTab.getPaymentLink(PAYMENT_ID_ONE).should('contain', 'GBP 450.00');
 
-      cy.assertText(pages.utilisationReportPage.premiumPaymentsTab.premiumPaymentsTable.status(FEE_RECORD_ID_ONE), FEE_RECORD_STATUS.MATCH);
+      cy.assertText(pages.utilisationReportPage.premiumPaymentsTab.premiumPaymentsTable.status(FEE_RECORD_ID_ONE), 'Match');
     });
 
     it('should display an error message when there are multiple payments to choose from and none have been selected', () => {
@@ -193,7 +193,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can add fee records to existing paymen
 
     pages.utilisationReportPage.premiumPaymentsTab.getPaymentLink(PAYMENT_ID_ONE).should('contain', 'GBP 450.00');
 
-    cy.assertText(pages.utilisationReportPage.premiumPaymentsTab.premiumPaymentsTable.status(FEE_RECORD_ID_ONE), FEE_RECORD_STATUS.MATCH);
+    cy.assertText(pages.utilisationReportPage.premiumPaymentsTab.premiumPaymentsTable.status(FEE_RECORD_ID_ONE), 'Match');
   });
 
   describe('when user navigates away', () => {

diff --git a/...tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/delete-payment.spec.js b/...tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/delete-payment.spec.js
@@ -104,7 +104,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can delete payments`, () => {
 
     cy.visit(`/utilisation-reports/${report.id}`);
 
-    cy.get('strong[data-cy="fee-record-status"]:contains("MATCH")').should('exist');
+    cy.get('strong[data-cy="fee-record-status"]:contains("Match")').should('exist');
     pages.utilisationReportPage.premiumPaymentsTab.clickPaymentLink(firstPayment.id);
 
     cy.url().should('eq', relative(`${editPaymentUrl}?redirectTab=premium-payments`));
@@ -119,7 +119,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can delete payments`, () => {
     cy.url().should('eq', relative(`/utilisation-reports/${report.id}#premium-payments`));
 
     pages.utilisationReportPage.premiumPaymentsTab.getPaymentLink(firstPayment.id).should('not.exist');
-    cy.get('strong[data-cy="fee-record-status"]:contains("DOES NOT MATCH")').should('exist');
+    cy.get('strong[data-cy="fee-record-status"]:contains("Does not match")').should('exist');
   });
 
   it(`allows the user to delete the payment and resets the status to '${FEE_RECORD_STATUS.MATCH}' when the remaining payments match`, () => {
@@ -139,7 +139,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can delete payments`, () => {
 
     cy.visit(`/utilisation-reports/${report.id}`);
 
-    cy.get('strong[data-cy="fee-record-status"]:contains("DOES NOT MATCH")').should('exist');
+    cy.get('strong[data-cy="fee-record-status"]:contains("Does not match")').should('exist');
     pages.utilisationReportPage.premiumPaymentsTab.clickPaymentLink(firstPayment.id);
 
     cy.url().should('eq', relative(`${editPaymentUrl}?redirectTab=premium-payments`));
@@ -154,7 +154,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can delete payments`, () => {
     cy.url().should('eq', relative(`/utilisation-reports/${report.id}#premium-payments`));
 
     pages.utilisationReportPage.premiumPaymentsTab.getPaymentLink(firstPayment.id).should('not.exist');
-    cy.get('strong[data-cy="fee-record-status"]:contains("MATCH")').should('exist');
+    cy.get('strong[data-cy="fee-record-status"]:contains("Match")').should('exist');
   });
 
   it(`allows the user to delete the payment and resets the status to '${FEE_RECORD_STATUS.TO_DO}' when all payments are deleted`, () => {
@@ -184,7 +184,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can delete payments`, () => {
     pages.utilisationReportConfirmDeletePaymentPage.clickContinueButton();
 
     pages.utilisationReportPage.premiumPaymentsTab.getPaymentLink(payment.id).should('not.exist');
-    cy.get('strong[data-cy="fee-record-status"]:contains("TO DO")').should('exist');
+    cy.get('strong[data-cy="fee-record-status"]:contains("To do")').should('exist');
   });
 
   it(`allows the user to delete all payments from a fee record with reported payments below the tolerance and resets the status to '${FEE_RECORD_STATUS.TO_DO}'`, () => {
@@ -215,7 +215,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can delete payments`, () => {
     pages.utilisationReportConfirmDeletePaymentPage.clickContinueButton();
 
     pages.utilisationReportPage.premiumPaymentsTab.getPaymentLink(payment.id).should('not.exist');
-    cy.get('strong[data-cy="fee-record-status"]:contains("TO DO")').should('exist');
+    cy.get('strong[data-cy="fee-record-status"]:contains("To do")').should('exist');
   });
 
   function* idGenerator() {

diff --git a/...s/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/edit-payment.spec.js b/...s/tfm/cypress/e2e/journeys/utilisation-reports/report-reconciliation/edit-payment.spec.js
@@ -254,7 +254,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can edit payments`, () => {
 
       cy.reload();
 
-      cy.get('strong[data-cy="fee-record-status"]:contains("MATCH")').should('exist');
+      cy.get('strong[data-cy="fee-record-status"]:contains("Match")').should('exist');
       pages.utilisationReportPage.premiumPaymentsTab.clickPaymentLink(paymentId);
 
       cy.url().should('eq', relative(`${editPaymentUrl}?redirectTab=premium-payments`));
@@ -266,7 +266,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can edit payments`, () => {
       pages.utilisationReportEditPaymentPage.clickSaveChangesButton();
 
       cy.url().should('eq', relative(`/utilisation-reports/${reportId}#premium-payments`));
-      cy.get('strong[data-cy="fee-record-status"]:contains("DOES NOT MATCH")').should('exist');
+      cy.get('strong[data-cy="fee-record-status"]:contains("Does not match")').should('exist');
     });
 
     it(`should set the fee record status to '${FEE_RECORD_STATUS.MATCH}' if the new amount matches the fee record amount`, () => {
@@ -279,7 +279,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can edit payments`, () => {
 
       cy.reload();
 
-      cy.get('strong[data-cy="fee-record-status"]:contains("DOES NOT MATCH")').should('exist');
+      cy.get('strong[data-cy="fee-record-status"]:contains("Does not match")').should('exist');
 
       pages.utilisationReportPage.premiumPaymentsTab.clickPaymentLink(paymentId);
 
@@ -292,8 +292,8 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can edit payments`, () => {
       pages.utilisationReportEditPaymentPage.clickSaveChangesButton();
 
       cy.url().should('eq', relative(`/utilisation-reports/${reportId}#premium-payments`));
-      cy.get('strong[data-cy="fee-record-status"]:contains("DOES NOT MATCH")').should('not.exist');
-      cy.get('strong[data-cy="fee-record-status"]:contains("MATCH")').should('exist');
+      cy.get('strong[data-cy="fee-record-status"]:contains("Does not match")').should('not.exist');
+      cy.get('strong[data-cy="fee-record-status"]:contains("Match")').should('exist');
     });
   });
 

diff --git a/...ress/e2e/journeys/utilisation-reports/report-reconciliation/generate-keying-sheet.spec.js b/...ress/e2e/journeys/utilisation-reports/report-reconciliation/generate-keying-sheet.spec.js
@@ -113,7 +113,7 @@ context('PDC_RECONCILE users can generate keying data', () => {
 
     cy.url().should('eq', relative(`/utilisation-reports/${REPORT_ID}#keying-sheet`));
 
-    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FIRST_FEE_RECORD_ID).should('contain', 'TO DO');
+    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FIRST_FEE_RECORD_ID).should('contain', 'To do');
     pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(SECOND_FEE_RECORD_ID).should('not.exist');
 
     pages.utilisationReportPage.keyingSheetTab.fixedFeeAdjustmentDecrease(FIRST_FEE_RECORD_ID).should('contain', '-');
@@ -160,8 +160,8 @@ context('PDC_RECONCILE users can generate keying data', () => {
 
     cy.url().should('eq', relative(`/utilisation-reports/${REPORT_ID}#keying-sheet`));
 
-    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FIRST_FEE_RECORD_ID).should('contain', 'TO DO');
-    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(SECOND_FEE_RECORD_ID).should('contain', 'TO DO');
+    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FIRST_FEE_RECORD_ID).should('contain', 'To do');
+    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(SECOND_FEE_RECORD_ID).should('contain', 'To do');
 
     /**
      * The principal balance adjustment is simply the

diff --git a/...ress/e2e/journeys/utilisation-reports/report-reconciliation/reconcile-fee-records.spec.js b/...ress/e2e/journeys/utilisation-reports/report-reconciliation/reconcile-fee-records.spec.js
@@ -149,16 +149,16 @@ context('PDC_RECONCILE users can reconcile fee records', () => {
   });
 
   it('can mark keying sheet rows as done and to do', () => {
-    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_ONE).should('contain', 'TO DO');
+    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_ONE).should('contain', 'To do');
 
     pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_ONE).within(() => cy.get('input[type="checkbox"]').click());
     pages.utilisationReportPage.keyingSheetTab.markAsDoneButton().click();
-    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_ONE).should('contain', 'DONE');
+    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_ONE).should('contain', 'Done');
 
     pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_ONE).within(() => cy.get('input[type="checkbox"]').click());
     pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_TWO).within(() => cy.get('input[type="checkbox"]').click());
     pages.utilisationReportPage.keyingSheetTab.markAsToDoButton().click();
-    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_ONE).should('contain', 'TO DO');
+    pages.utilisationReportPage.keyingSheetTab.keyingSheetTableRow(FEE_RECORD_ID_ONE).should('contain', 'To do');
   });
 
   it('updates report status when all fee records are reconciled and when some are unreconciled', () => {

diff --git a/...s/e2e/journeys/utilisation-reports/report-reconciliation/remove-fees-from-payment.spec.js b/...s/e2e/journeys/utilisation-reports/report-reconciliation/remove-fees-from-payment.spec.js
@@ -175,7 +175,7 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can remove fees from payments`, () =>
 
     cy.visit(`/utilisation-reports/${reportId}`);
 
-    cy.get('strong[data-cy="fee-record-status"]:contains("MATCH")').should('exist');
+    cy.get('strong[data-cy="fee-record-status"]:contains("Match")').should('exist');
     pages.utilisationReportPage.premiumPaymentsTab.clickPaymentLink(paymentId);
 
     cy.url().should('eq', relative(`${editPaymentUrl}?redirectTab=premium-payments`));
@@ -186,6 +186,6 @@ context(`${PDC_TEAMS.PDC_RECONCILE} users can remove fees from payments`, () =>
     cy.url().should('eq', relative(`${editPaymentUrl}?redirectTab=premium-payments`));
 
     cy.visit(`/utilisation-reports/${reportId}`);
-    cy.get('strong[data-cy="fee-record-status"]:contains("DOES NOT MATCH")').should('exist');
+    cy.get('strong[data-cy="fee-record-status"]:contains("Does not match")').should('exist');
   });
 });
diff --git a/gef-ui/component-tests/assertions.js b/gef-ui/component-tests/assertions.js
@@ -19,16 +19,16 @@ const assertions = (wrapper, html) => ({
       expect(wrapper(selector).html()).toBeNull();
     },
     toBeDisabled: () => {
-      expect(wrapper(selector).hasClass('govuk-button--disabled')).toEqual(true);
       expect(wrapper(selector).hasClass('govuk-button--secondary')).toEqual(false);
       expect(wrapper(selector).attr('href')).toBeUndefined();
       expect(wrapper(selector).attr('disabled')).toEqual('disabled');
+      expect(wrapper(selector).attr('aria-disabled')).toEqual('true');
     },
     toLinkTo: (href, text) => {
-      expect(wrapper(selector).hasClass('govuk-button--disabled')).toEqual(false);
       expect(wrapper(selector).hasClass('govuk-button--secondary')).toEqual(false);
       expect(wrapper(selector).attr('href')).toEqual(href);
       expect(wrapper(selector).attr('disabled')).toBeUndefined();
+      expect(wrapper(selector).attr('aria-disabled')).toBeUndefined();
       expect(wrapper(selector).text().trim()).toEqual(text);
     },
   }),
@@ -37,16 +37,16 @@ const assertions = (wrapper, html) => ({
       expect(wrapper(selector).html()).toBeNull();
     },
     toBeDisabled: () => {
-      expect(wrapper(selector).hasClass('govuk-button--disabled')).toEqual(true);
       expect(wrapper(selector).hasClass('govuk-button--secondary')).toEqual(true);
       expect(wrapper(selector).attr('href')).toBeUndefined();
       expect(wrapper(selector).attr('disabled')).toEqual('disabled');
+      expect(wrapper(selector).attr('aria-disabled')).toEqual('true');
     },
     toLinkTo: (href, text) => {
-      expect(wrapper(selector).hasClass('govuk-button--disabled')).toEqual(false);
       expect(wrapper(selector).hasClass('govuk-button--secondary')).toEqual(true);
       expect(wrapper(selector).attr('href')).toEqual(href);
       expect(wrapper(selector).attr('disabled')).toBeUndefined();
+      expect(wrapper(selector).attr('aria-disabled')).toBeUndefined();
       expect(wrapper(selector).text().trim()).toEqual(text);
     },
   }),

diff --git a/gef-ui/package.json b/gef-ui/package.json
@@ -34,7 +34,7 @@
     "unit-test-ff": "jest --coverage --verbose --config=unit.ff.jest.config.js --passWithNoTests"
   },
   "dependencies": {
-    "@ministryofjustice/frontend": "1.8.0",
+    "@ministryofjustice/frontend": "3.0.2",
     "@ukef/dtfs2-common": "1.0.0",
     "ajv": "^8.17.1",
     "axios": "^1.7.8",
@@ -57,7 +57,7 @@
     "express-session": "1.17.3",
     "filesize": "9.0.11",
     "form-data": "4.0.0",
-    "govuk-frontend": "^4.9.0",
+    "govuk-frontend": "^5.7.1",
     "http-errors": "^2.0.0",
     "imask": "^6.6.3",
     "joi": "^17.13.3",

diff --git a/gef-ui/public/css/styles.css b/gef-ui/public/css/styles.css