Merge branch 'main-iterations-2' into chore/EMS-4095-2

UK-Export-Finance · Jan 6, 2025 · 6599dfe · 6599dfe
2 parents 6508bc0 + 6516915
commit 6599dfe
Show file tree

Hide file tree

Showing 485 changed files with 3,823 additions and 2,038 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,72 +2,65 @@
 
 ## [2.36.3](https://github.com/UK-Export-Finance/exip/compare/v2.36.2...v2.36.3) (2024-11-14)
 
-
 ### Bug Fixes
 
-* **EMS-3988:** apply - type of policy - hint text ([#3305](https://github.com/UK-Export-Finance/exip/issues/3305)) ([885194b](https://github.com/UK-Export-Finance/exip/commit/885194b3bffed7c4e28fd1767406495ed75b7e56))
+- **EMS-3988:** apply - type of policy - hint text ([#3305](https://github.com/UK-Export-Finance/exip/issues/3305)) ([885194b](https://github.com/UK-Export-Finance/exip/commit/885194b3bffed7c4e28fd1767406495ed75b7e56))
 
 ## [2.36.2](https://github.com/UK-Export-Finance/exip/compare/v2.36.1...v2.36.2) (2024-11-13)
 
-
 ### Bug Fixes
 
-* **EMS-3988:** regenerate api schema ([#3301](https://github.com/UK-Export-Finance/exip/issues/3301)) ([81b382c](https://github.com/UK-Export-Finance/exip/commit/81b382c4039f089101623f2b1a740a1a97ce9797))
+- **EMS-3988:** regenerate api schema ([#3301](https://github.com/UK-Export-Finance/exip/issues/3301)) ([81b382c](https://github.com/UK-Export-Finance/exip/commit/81b382c4039f089101623f2b1a740a1a97ce9797))
 
 ## [2.36.1](https://github.com/UK-Export-Finance/exip/compare/v2.36.0...v2.36.1) (2024-11-13)
 
-
 ### Bug Fixes
 
-* **EMS-3988:** quote tool - type of policy - hint text ([3bd562c](https://github.com/UK-Export-Finance/exip/commit/3bd562ca8df1c85c787137e251f62c4b601d9a45))
+- **EMS-3988:** quote tool - type of policy - hint text ([3bd562c](https://github.com/UK-Export-Finance/exip/commit/3bd562ca8df1c85c787137e251f62c4b601d9a45))
 
 ## [2.36.0](https://github.com/UK-Export-Finance/exip/compare/v2.35.5...v2.36.0) (2024-11-01)
 
-
 ### Features
 
-* **EMS-3767-3768-3781:** business - turnover currency page and check your answers ([#2987](https://github.com/UK-Export-Finance/exip/issues/2987)) ([869054b](https://github.com/UK-Export-Finance/exip/commit/869054b49ce984d928a7a90af911614f38804ca3))
-* **EMS-3769-3770-3771-3772-3782:** buyer - split outstanding/overdue and failed payments ([#3012](https://github.com/UK-Export-Finance/exip/issues/3012)) ([00a704b](https://github.com/UK-Export-Finance/exip/commit/00a704b1bbada6f3b274a52305421abbb660c800))
-* **EMS-3773-3792:** policy - single contract - credit limit field ([#3026](https://github.com/UK-Export-Finance/exip/issues/3026)) ([ef3edaf](https://github.com/UK-Export-Finance/exip/commit/ef3edafd00a5ed8e956578086159f54b87848c68))
-* **EMS-3783-3792:** policy - check/change your answers - credit limit field ([#3029](https://github.com/UK-Export-Finance/exip/issues/3029)) ([76d8bad](https://github.com/UK-Export-Finance/exip/commit/76d8badc3537c1d6a570e918400dd8aaa870d1b5))
-* **EMS-3825:** export contract - remove fixed sum amount from the ui ([#3051](https://github.com/UK-Export-Finance/exip/issues/3051)) ([a01d96b](https://github.com/UK-Export-Finance/exip/commit/a01d96b937ddcf94bdb90fb17d4bb861d0931808))
-* **EMS-3826-3827:** export contract - agent charges currency - page setup ([#3067](https://github.com/UK-Export-Finance/exip/issues/3067)) ([e059ccc](https://github.com/UK-Export-Finance/exip/commit/e059ccc5310ffb704214bd02439039c6434bbe89))
-* **EMS-3826-3829:** export contract - agent charges - user flow ([#3098](https://github.com/UK-Export-Finance/exip/issues/3098)) ([be6a35a](https://github.com/UK-Export-Finance/exip/commit/be6a35a7aca016b80845f53efa9afa4f2bd48abb))
-* **EMS-3828-3876:** currency of agent charges - save and back, improve e2e assertions ([#3101](https://github.com/UK-Export-Finance/exip/issues/3101)) ([f9769ee](https://github.com/UK-Export-Finance/exip/commit/f9769ee48e17d7b3284f52a0886eb2b8e987c18c))
-* **EMS-3829:** export contract - how much is the agent charging - page setup, validation ([#3072](https://github.com/UK-Export-Finance/exip/issues/3072)) ([42e4c11](https://github.com/UK-Export-Finance/exip/commit/42e4c11f8b52a01db279172bb05277887686d2a7))
-* **EMS-3833:** export contract - how much agent is charging - data saving ([#3122](https://github.com/UK-Export-Finance/exip/issues/3122)) ([cd6398b](https://github.com/UK-Export-Finance/exip/commit/cd6398b21f6e7905c1f43ac855af2d26ad332f99))
-* **EMS-3851-3852:** export contract - change answers - currency of agent charges ([#3132](https://github.com/UK-Export-Finance/exip/issues/3132)) ([e3fa1ae](https://github.com/UK-Export-Finance/exip/commit/e3fa1ae3adff3be04cff8aaf41e5da902dea4cb8))
-* **EMS-3853-54-55:** export contract - agent charges - change answers ([#3142](https://github.com/UK-Export-Finance/exip/issues/3142)) ([3087bed](https://github.com/UK-Export-Finance/exip/commit/3087bed0e2e40fad8d581af7ceeacab315b407ad))
-* **EMS-3877-3879:** business - turnover currency - save and back ([#3129](https://github.com/UK-Export-Finance/exip/issues/3129)) ([ff4fcf4](https://github.com/UK-Export-Finance/exip/commit/ff4fcf465c015edd689807be6ade950eca609c7b))
-* **EMS-3893:** buyer - currency of late payments - save and back ([#3128](https://github.com/UK-Export-Finance/exip/issues/3128)) ([1a59d47](https://github.com/UK-Export-Finance/exip/commit/1a59d470c2e4f4d1e7c2f333f45137da5861fa10))
-
+- **EMS-3767-3768-3781:** business - turnover currency page and check your answers ([#2987](https://github.com/UK-Export-Finance/exip/issues/2987)) ([869054b](https://github.com/UK-Export-Finance/exip/commit/869054b49ce984d928a7a90af911614f38804ca3))
+- **EMS-3769-3770-3771-3772-3782:** buyer - split outstanding/overdue and failed payments ([#3012](https://github.com/UK-Export-Finance/exip/issues/3012)) ([00a704b](https://github.com/UK-Export-Finance/exip/commit/00a704b1bbada6f3b274a52305421abbb660c800))
+- **EMS-3773-3792:** policy - single contract - credit limit field ([#3026](https://github.com/UK-Export-Finance/exip/issues/3026)) ([ef3edaf](https://github.com/UK-Export-Finance/exip/commit/ef3edafd00a5ed8e956578086159f54b87848c68))
+- **EMS-3783-3792:** policy - check/change your answers - credit limit field ([#3029](https://github.com/UK-Export-Finance/exip/issues/3029)) ([76d8bad](https://github.com/UK-Export-Finance/exip/commit/76d8badc3537c1d6a570e918400dd8aaa870d1b5))
+- **EMS-3825:** export contract - remove fixed sum amount from the ui ([#3051](https://github.com/UK-Export-Finance/exip/issues/3051)) ([a01d96b](https://github.com/UK-Export-Finance/exip/commit/a01d96b937ddcf94bdb90fb17d4bb861d0931808))
+- **EMS-3826-3827:** export contract - agent charges currency - page setup ([#3067](https://github.com/UK-Export-Finance/exip/issues/3067)) ([e059ccc](https://github.com/UK-Export-Finance/exip/commit/e059ccc5310ffb704214bd02439039c6434bbe89))
+- **EMS-3826-3829:** export contract - agent charges - user flow ([#3098](https://github.com/UK-Export-Finance/exip/issues/3098)) ([be6a35a](https://github.com/UK-Export-Finance/exip/commit/be6a35a7aca016b80845f53efa9afa4f2bd48abb))
+- **EMS-3828-3876:** currency of agent charges - save and back, improve e2e assertions ([#3101](https://github.com/UK-Export-Finance/exip/issues/3101)) ([f9769ee](https://github.com/UK-Export-Finance/exip/commit/f9769ee48e17d7b3284f52a0886eb2b8e987c18c))
+- **EMS-3829:** export contract - how much is the agent charging - page setup, validation ([#3072](https://github.com/UK-Export-Finance/exip/issues/3072)) ([42e4c11](https://github.com/UK-Export-Finance/exip/commit/42e4c11f8b52a01db279172bb05277887686d2a7))
+- **EMS-3833:** export contract - how much agent is charging - data saving ([#3122](https://github.com/UK-Export-Finance/exip/issues/3122)) ([cd6398b](https://github.com/UK-Export-Finance/exip/commit/cd6398b21f6e7905c1f43ac855af2d26ad332f99))
+- **EMS-3851-3852:** export contract - change answers - currency of agent charges ([#3132](https://github.com/UK-Export-Finance/exip/issues/3132)) ([e3fa1ae](https://github.com/UK-Export-Finance/exip/commit/e3fa1ae3adff3be04cff8aaf41e5da902dea4cb8))
+- **EMS-3853-54-55:** export contract - agent charges - change answers ([#3142](https://github.com/UK-Export-Finance/exip/issues/3142)) ([3087bed](https://github.com/UK-Export-Finance/exip/commit/3087bed0e2e40fad8d581af7ceeacab315b407ad))
+- **EMS-3877-3879:** business - turnover currency - save and back ([#3129](https://github.com/UK-Export-Finance/exip/issues/3129)) ([ff4fcf4](https://github.com/UK-Export-Finance/exip/commit/ff4fcf465c015edd689807be6ade950eca609c7b))
+- **EMS-3893:** buyer - currency of late payments - save and back ([#3128](https://github.com/UK-Export-Finance/exip/issues/3128)) ([1a59d47](https://github.com/UK-Export-Finance/exip/commit/1a59d470c2e4f4d1e7c2f333f45137da5861fa10))
 
 ### Bug Fixes
 
-* **EMS-3511:** task list - declarations/submit dependencies ([#2965](https://github.com/UK-Export-Finance/exip/issues/2965)) ([57b5c8f](https://github.com/UK-Export-Finance/exip/commit/57b5c8f5491d3c0671ec44b3af049305e66f23f2))
-* **EMS-3659:** declarations - confirmation/acknowledgements - submit button copy ([#2960](https://github.com/UK-Export-Finance/exip/issues/2960)) ([d183d21](https://github.com/UK-Export-Finance/exip/commit/d183d210e1cee28e538f1ec938fd64fb8c5b9f1e))
-* **EMS-3755:** fix failing e2e tests ([#2949](https://github.com/UK-Export-Finance/exip/issues/2949)) ([994e19a](https://github.com/UK-Export-Finance/exip/commit/994e19a3c692a4ba88c5f6b406e29af16ad509e5))
-* **EMS-3787:** export contract - agent name with an apostrophe ([#2989](https://github.com/UK-Export-Finance/exip/issues/2989)) ([7f64dcf](https://github.com/UK-Export-Finance/exip/commit/7f64dcf4fd244ef8fdc4b634a31a44dccec642a4))
-* **EMS-3804:** eligibility - end buyer - error message ([#3049](https://github.com/UK-Export-Finance/exip/issues/3049)) ([3a02b8c](https://github.com/UK-Export-Finance/exip/commit/3a02b8c85f5476d5faa3064f97034aa730b54549))
-* **EMS-3822:** your buyer - outstanding/overdue payments - label currencies ([#3048](https://github.com/UK-Export-Finance/exip/issues/3048)) ([c905028](https://github.com/UK-Export-Finance/exip/commit/c905028e9c12138fcf514204ec550502650ba807))
-* **EMS-3831:** buyer - outstanding/overdue payments - missing hint text ([#3120](https://github.com/UK-Export-Finance/exip/issues/3120)) ([adedd9a](https://github.com/UK-Export-Finance/exip/commit/adedd9a8594ebd42645de4e2ac5bf2c5a1d1b9eb))
-* **EMS-3901:** data migration - requestedCreditLimit column ([#3255](https://github.com/UK-Export-Finance/exip/issues/3255)) ([cf86b8e](https://github.com/UK-Export-Finance/exip/commit/cf86b8e0d6b5876fd8806726e5fb5c769f2a0ca2))
-* **EMS-3945:** policy - total contract value - credit limit hint ([#3197](https://github.com/UK-Export-Finance/exip/issues/3197)) ([f562f23](https://github.com/UK-Export-Finance/exip/commit/f562f23e71821155ff04d1132c89ea8fdca8573a))
-* **EMS-3959:** multiple contract policy - error message/hint ([c266b2e](https://github.com/UK-Export-Finance/exip/commit/c266b2e7895d7a21ae2d43f413086fb437c5fe21))
+- **EMS-3511:** task list - declarations/submit dependencies ([#2965](https://github.com/UK-Export-Finance/exip/issues/2965)) ([57b5c8f](https://github.com/UK-Export-Finance/exip/commit/57b5c8f5491d3c0671ec44b3af049305e66f23f2))
+- **EMS-3659:** declarations - confirmation/acknowledgements - submit button copy ([#2960](https://github.com/UK-Export-Finance/exip/issues/2960)) ([d183d21](https://github.com/UK-Export-Finance/exip/commit/d183d210e1cee28e538f1ec938fd64fb8c5b9f1e))
+- **EMS-3755:** fix failing e2e tests ([#2949](https://github.com/UK-Export-Finance/exip/issues/2949)) ([994e19a](https://github.com/UK-Export-Finance/exip/commit/994e19a3c692a4ba88c5f6b406e29af16ad509e5))
+- **EMS-3787:** export contract - agent name with an apostrophe ([#2989](https://github.com/UK-Export-Finance/exip/issues/2989)) ([7f64dcf](https://github.com/UK-Export-Finance/exip/commit/7f64dcf4fd244ef8fdc4b634a31a44dccec642a4))
+- **EMS-3804:** eligibility - end buyer - error message ([#3049](https://github.com/UK-Export-Finance/exip/issues/3049)) ([3a02b8c](https://github.com/UK-Export-Finance/exip/commit/3a02b8c85f5476d5faa3064f97034aa730b54549))
+- **EMS-3822:** your buyer - outstanding/overdue payments - label currencies ([#3048](https://github.com/UK-Export-Finance/exip/issues/3048)) ([c905028](https://github.com/UK-Export-Finance/exip/commit/c905028e9c12138fcf514204ec550502650ba807))
+- **EMS-3831:** buyer - outstanding/overdue payments - missing hint text ([#3120](https://github.com/UK-Export-Finance/exip/issues/3120)) ([adedd9a](https://github.com/UK-Export-Finance/exip/commit/adedd9a8594ebd42645de4e2ac5bf2c5a1d1b9eb))
+- **EMS-3901:** data migration - requestedCreditLimit column ([#3255](https://github.com/UK-Export-Finance/exip/issues/3255)) ([cf86b8e](https://github.com/UK-Export-Finance/exip/commit/cf86b8e0d6b5876fd8806726e5fb5c769f2a0ca2))
+- **EMS-3945:** policy - total contract value - credit limit hint ([#3197](https://github.com/UK-Export-Finance/exip/issues/3197)) ([f562f23](https://github.com/UK-Export-Finance/exip/commit/f562f23e71821155ff04d1132c89ea8fdca8573a))
+- **EMS-3959:** multiple contract policy - error message/hint ([c266b2e](https://github.com/UK-Export-Finance/exip/commit/c266b2e7895d7a21ae2d43f413086fb437c5fe21))
 
 ## [2.35.5](https://github.com/UK-Export-Finance/exip/compare/v2.35.4...v2.35.5) (2024-08-12)
 
-
 ### Bug Fixes
 
-* **EMS-3633:** data migration - xlsx - total contract value ([#2934](https://github.com/UK-Export-Finance/exip/issues/2934)) ([f0bfdba](https://github.com/UK-Export-Finance/exip/commit/f0bfdba5d1b1300018ab67b0224c2dfeb6993e4c))
+- **EMS-3633:** data migration - xlsx - total contract value ([#2934](https://github.com/UK-Export-Finance/exip/issues/2934)) ([f0bfdba](https://github.com/UK-Export-Finance/exip/commit/f0bfdba5d1b1300018ab67b0224c2dfeb6993e4c))
 
 ## [2.35.4](https://github.com/UK-Export-Finance/exip/compare/v2.35.3...v2.35.4) (2024-08-09)
 
-
 ### Bug Fixes
 
-* **EMS-3633:** data migration - xlsx - eligibility questions ([#2932](https://github.com/UK-Export-Finance/exip/issues/2932)) ([f80ac41](https://github.com/UK-Export-Finance/exip/commit/f80ac410e050353a055ed4d1ca462c7bc96c617c))
+- **EMS-3633:** data migration - xlsx - eligibility questions ([#2932](https://github.com/UK-Export-Finance/exip/issues/2932)) ([f80ac41](https://github.com/UK-Export-Finance/exip/commit/f80ac410e050353a055ed4d1ca462c7bc96c617c))
 
 ## [2.35.3](https://github.com/UK-Export-Finance/exip/compare/v2.35.2...v2.35.3) (2024-08-09)
 

diff --git a/e2e-tests/commands/api/index.js b/e2e-tests/commands/api/index.js
@@ -274,7 +274,7 @@ const createApplications = (accountId, count) => {
 
     return responseBody;
   } catch (error) {
-    console.error('Creating applications', error);
+    console.error('Creating applications %o', error);
 
     throw new Error('Creating applications', { error });
   }

diff --git a/e2e-tests/commands/core-page-checks.js b/e2e-tests/commands/core-page-checks.js
@@ -21,7 +21,6 @@ const baseUrl = Cypress.config('baseUrl');
  * @param {String} expectedHref - Expected "back" HREF/route
  */
 const checkBackLink = (currentHref, expectedHref) => {
-  backLinkSelector().should('exist');
   cy.checkText(backLinkSelector(), LINKS.BACK);
 
   cy.clickBackLink();

diff --git a/e2e-tests/commands/insurance/account/assert-password-reveal-button.js b/e2e-tests/commands/insurance/account/assert-password-reveal-button.js
@@ -14,8 +14,6 @@ const EXPECTED_ARIA_LABELS = {
 };
 
 const shouldRender = () => {
-  passwordField.revealButton().should('exist');
-
   cy.checkText(passwordField.revealButton(), FIELD_STRINGS.REVEAL.SHOW);
   cy.checkAriaLabel(passwordField.revealButton(), EXPECTED_ARIA_LABELS.SHOW);
 };

diff --git a/e2e-tests/commands/insurance/account/delete-account.js b/e2e-tests/commands/insurance/account/delete-account.js
@@ -14,7 +14,7 @@ const deleteAccount = (email = accountEmail) => {
 
     return deleteResponse;
   } catch (error) {
-    console.error('Deleting account', error);
+    console.error('Deleting account %o', error);
 
     return error;
   }

diff --git a/e2e-tests/commands/insurance/complete-and-submit-export-value-form.js b/e2e-tests/commands/insurance/complete-and-submit-export-value-form.js
@@ -1,9 +1,12 @@
 /**
  * completeAndSubmitExportValueForm
  * Complete and submit the "Export value" form
+ * @param {String} totalSalesToBuyer: Total sales to the buyer
+ * @param {String} maximumBuyerWillOwe: Maximum buyer will owe
  */
-const completeAndSubmitExportValueForm = () => {
-  cy.completeExportValueForm();
+const completeAndSubmitExportValueForm = ({ totalSalesToBuyer, maximumBuyerWillOwe }) => {
+  cy.completeExportValueForm({ totalSalesToBuyer, maximumBuyerWillOwe });
+
   cy.clickSubmitButton();
 };
 

diff --git a/e2e-tests/commands/insurance/complete-export-value-form.js b/e2e-tests/commands/insurance/complete-export-value-form.js
@@ -12,11 +12,16 @@ const {
 /**
  * completeExportValueForm
  * Complete the "Export value" form
+ * @param {String} totalSalesToBuyer: Total sales to the buyer
+ * @param {String} maximumBuyerWillOwe: Maximum buyer will owe
  */
-const completeExportValueForm = () => {
-  cy.keyboardInput(field(TOTAL_SALES_TO_BUYER).input(), application.POLICY[TOTAL_SALES_TO_BUYER]);
+const completeExportValueForm = ({
+  totalSalesToBuyer = application.POLICY[TOTAL_SALES_TO_BUYER],
+  maximumBuyerWillOwe = application.POLICY[MAXIMUM_BUYER_WILL_OWE],
+}) => {
+  cy.keyboardInput(field(TOTAL_SALES_TO_BUYER).input(), totalSalesToBuyer);
 
-  cy.keyboardInput(multipleContractPolicyExportValuePage[MAXIMUM_BUYER_WILL_OWE].input(), application.POLICY[MAXIMUM_BUYER_WILL_OWE]);
+  cy.keyboardInput(multipleContractPolicyExportValuePage[MAXIMUM_BUYER_WILL_OWE].input(), maximumBuyerWillOwe);
 };
 
 export default completeExportValueForm;
diff --git a/e2e-tests/commands/insurance/complete-policy-section.js b/e2e-tests/commands/insurance/complete-policy-section.js
@@ -10,6 +10,7 @@ const { POLICY_TYPE } = APPLICATION;
  * @param {Boolean} policyValueOverMvpMaximum: If the value should be over the MVP maximum amount
  * @param {String} isoCode: Policy currency ISO code
  * @param {Boolean} alternativeCurrency: Select the "alternative currency" option
+ * @param {String} maximumBuyerWillOwe: Maximum buyer will owe
  * @param {Boolean} sameName: If name on policy is the same as the signed in user - defaults to true
  * @param {Boolean} needPreCreditPeriod: If the user needs a pre-credit period - defaults to false
  * @param {Boolean} usingBroker: If "using broker" on  - defaults to false
@@ -24,6 +25,7 @@ const completePolicySection = ({
   policyValueOverMvpMaximum = false,
   isoCode,
   alternativeCurrency = false,
+  maximumBuyerWillOwe,
   sameName = true,
   needPreCreditPeriod = false,
   usingBroker = false,
@@ -49,7 +51,7 @@ const completePolicySection = ({
       alternativeCurrency,
     });
 
-    cy.completeAndSubmitExportValueForm({ policyType });
+    cy.completeAndSubmitExportValueForm({ maximumBuyerWillOwe });
   }
 
   cy.completeAndSubmitNameOnPolicyForm({ sameName });

diff --git a/e2e-tests/commands/insurance/complete-prepare-application-section-multiple-policy-type.js b/e2e-tests/commands/insurance/complete-prepare-application-section-multiple-policy-type.js
@@ -22,6 +22,7 @@ const { POLICY_TYPE } = APPLICATION;
  * @param {Boolean} contractAwardedNegotiatedContract: "How was the contract awarded" method as NEGOTIATED_CONTRACT
  * @param {Boolean} contractAwardedOpenTender: "How was the contract awarded" method as OPEN_TENDER
  * @param {Boolean} contractAwardedOtherMethod: "How was the contract awarded" method as OTHER
+ * @param {String} maximumBuyerWillOwe: Maximum buyer will owe
  * @param {Boolean} differentPolicyContact: Should submit an application with a different policy contact to the owner.
  * @param {Boolean} differentTradingName: Should submit "yes" to "have a different trading name" in the "company details" form.
  * @param {Boolean} differentTradingAddress: Should submit "yes" to "trade from a different address" in the "company details" form.
@@ -59,6 +60,7 @@ const completePrepareApplicationMultiplePolicyType = ({
   contractAwardedNegotiatedContract = false,
   contractAwardedOpenTender = true,
   contractAwardedOtherMethod = false,
+  maximumBuyerWillOwe,
   differentPolicyContact = false,
   differentTradingName = false,
   differentTradingAddress = false,
@@ -102,6 +104,7 @@ const completePrepareApplicationMultiplePolicyType = ({
 
   cy.completePolicySection({
     policyType: POLICY_TYPE.MULTIPLE,
+    maximumBuyerWillOwe,
     sameName: !differentPolicyContact,
     policyValueOverMvpMaximum,
     submitCheckYourAnswers,