feat(EMS-3853-54-55): export contract - agent charges - change answers (

#3142) * feat(EMS-3853-54-55): export contract - agent charges - check/change answers * chore(tests): update default completeAndSubmitAlternativeCurrencyForm param * feat(EMS-3853-54-55): fix/update e2e tests * feat(EMS-3853-54-55): update export contract summary list fixedSumAmount url * chore(tests): fix/update unit test * chore(tests): fix typo * feat(EMS-3853-54-55): fix/update e2e tests * feat(EMS-3853-54-55): improve e2e test coverage * feat(EMS-3853-54-55): remove unused e2e tests * chore(tests): remove commented code * feat(EMS-3853-54-55): fix/update e2e test * chore(docs): remove empty line
UK-Export-Finance · Oct 9, 2024 · 3087bed · 3087bed
1 parent 1a59d47
commit 3087bed
Show file tree

Hide file tree

Showing 36 changed files with 461 additions and 812 deletions.
diff --git a/e2e-tests/commands/insurance/check-export-contract-summary-list.js b/e2e-tests/commands/insurance/check-export-contract-summary-list.js
@@ -1,22 +1,25 @@
 import { summaryList } from '../../pages/shared';
 import getSummaryListField from './get-summary-list-field';
 import { EXPECTED_SINGLE_LINE_STRING, FIELD_VALUES } from '../../constants';
-import FIELD_IDS from '../../constants/field-ids/insurance/export-contract';
+import { INSURANCE_FIELD_IDS } from '../../constants/field-ids/insurance';
 import { EXPORT_CONTRACT_FIELDS as FIELDS } from '../../content-strings/fields/insurance/export-contract';
 import formatCurrency from '../../helpers/format-currency';
 import application from '../../fixtures/application';
 import COUNTRIES from '../../fixtures/countries';
 
 const {
-  HOW_WAS_THE_CONTRACT_AWARDED: { AWARD_METHOD },
-  ABOUT_GOODS_OR_SERVICES: { DESCRIPTION, FINAL_DESTINATION },
-  HOW_WILL_YOU_GET_PAID: { PAYMENT_TERMS_DESCRIPTION },
-  PRIVATE_MARKET: { ATTEMPTED, DECLINED_DESCRIPTION },
-  USING_AGENT,
-  AGENT_DETAILS: { NAME, FULL_ADDRESS, COUNTRY_CODE },
-  AGENT_SERVICE: { IS_CHARGING, SERVICE_DESCRIPTION },
-  AGENT_CHARGES: { FIXED_SUM_AMOUNT, FIXED_SUM_CURRENCY_CODE, PERCENTAGE_CHARGE, PAYABLE_COUNTRY_CODE },
-} = FIELD_IDS;
+  CURRENCY: { CURRENCY_CODE },
+  EXPORT_CONTRACT: {
+    HOW_WAS_THE_CONTRACT_AWARDED: { AWARD_METHOD },
+    ABOUT_GOODS_OR_SERVICES: { DESCRIPTION, FINAL_DESTINATION },
+    HOW_WILL_YOU_GET_PAID: { PAYMENT_TERMS_DESCRIPTION },
+    PRIVATE_MARKET: { ATTEMPTED, DECLINED_DESCRIPTION },
+    USING_AGENT,
+    AGENT_DETAILS: { NAME, FULL_ADDRESS, COUNTRY_CODE },
+    AGENT_SERVICE: { IS_CHARGING, SERVICE_DESCRIPTION },
+    AGENT_CHARGES: { FIXED_SUM_AMOUNT, FIXED_SUM_CURRENCY_CODE, PERCENTAGE_CHARGE, PAYABLE_COUNTRY_CODE },
+  },
+} = INSURANCE_FIELD_IDS;
 
 const { OPEN_TENDER } = FIELDS.HOW_WAS_THE_CONTRACT_AWARDED[AWARD_METHOD].OPTIONS;
 
@@ -218,16 +221,22 @@ const checkExportContractSummaryList = {
     }
   },
   [FIXED_SUM_CURRENCY_CODE]: ({ shouldRender = false }) => {
-    const fieldId = FIXED_SUM_CURRENCY_CODE;
+    /**
+     * NOTE:
+     * - The summary list uses the CURRENCY_CODE field ID.
+     * - The data uses the FIXED_SUM_CURRENCY_CODE field ID.
+     * The summary has to use the CURRENCY_CODE field ID to match the generic curency form field ID.
+     */
+    const summaryListFieldId = CURRENCY_CODE;
 
     if (shouldRender) {
-      const { expectedKey, expectedChangeLinkText } = getSummaryListField(fieldId, FIELDS.AGENT_CHARGES);
+      const { expectedKey, expectedChangeLinkText } = getSummaryListField(summaryListFieldId, FIELDS.AGENT_CHARGES);
 
-      const expectedValue = application.EXPORT_CONTRACT.AGENT_CHARGES[fieldId];
+      const expectedValue = application.EXPORT_CONTRACT.AGENT_CHARGES[FIXED_SUM_CURRENCY_CODE];
 
-      cy.assertSummaryListRow(summaryList, fieldId, expectedKey, expectedValue, expectedChangeLinkText);
+      cy.assertSummaryListRow(summaryList, summaryListFieldId, expectedKey, expectedValue, expectedChangeLinkText);
     } else {
-      cy.assertSummaryListRowDoesNotExist(summaryList, fieldId);
+      cy.assertSummaryListRowDoesNotExist(summaryList, summaryListFieldId);
     }
   },
   [FIXED_SUM_AMOUNT]: ({ shouldRender = false, agentChargeFixedSumAmount }) => {

diff --git a/e2e-tests/commands/insurance/complete-and-submit-alternative-currency-form.js b/e2e-tests/commands/insurance/complete-and-submit-alternative-currency-form.js
@@ -11,7 +11,7 @@ const { CURRENCY_CODE } = INSURANCE_FIELD_IDS.CURRENCY;
  * @param {String} isoCode: isoCode for radio selection.
  * @param {Boolean} alternativeCurrency: If alternative currency should be entered.
  */
-const completeAndSubmitAlternativeCurrencyForm = ({ isoCode, alternativeCurrency = true }) => {
+const completeAndSubmitAlternativeCurrencyForm = ({ isoCode, alternativeCurrency = false }) => {
   if (isoCode) {
     radios(CURRENCY_CODE, isoCode).option.label().click();
     cy.clickSubmitButton();

diff --git a/e2e-tests/fixtures/application.js b/e2e-tests/fixtures/application.js
@@ -61,7 +61,7 @@ const {
       PRIVATE_MARKET: { ATTEMPTED, DECLINED_DESCRIPTION },
       AGENT_DETAILS: { COUNTRY_CODE: AGENT_COUNTRY_CODE, FULL_ADDRESS: AGENT_FULL_ADDRESS, NAME: AGENT_NAME },
       AGENT_SERVICE: { IS_CHARGING, SERVICE_DESCRIPTION },
-      AGENT_CHARGES: { METHOD, PAYABLE_COUNTRY_CODE, FIXED_SUM_AMOUNT, PERCENTAGE_CHARGE },
+      AGENT_CHARGES: { METHOD, PAYABLE_COUNTRY_CODE, FIXED_SUM_AMOUNT, FIXED_SUM_CURRENCY_CODE, PERCENTAGE_CHARGE },
     },
     EXPORTER_BUSINESS: {
       ALTERNATIVE_TRADING_ADDRESS: { FULL_ADDRESS: EXPORTER_BUSINESS_FULL_ALT_TRADING_ADDRESS },
@@ -176,6 +176,7 @@ const application = {
     AGENT_CHARGES: {
       [PERCENTAGE_CHARGE]: '10',
       [FIXED_SUM_AMOUNT]: '1500',
+      [FIXED_SUM_CURRENCY_CODE]: GBP_CURRENCY_CODE,
       [METHOD]: AGENT_SERVICE_CHARGE.METHOD.FIXED_SUM,
       [PAYABLE_COUNTRY_CODE]: COUNTRY_APPLICATION_SUPPORT.ONLINE.NAME,
     },

diff --git a/...t-charges/change-your-answers-agent-charges-fixed-sum-amount-alternative-currency.spec.js b/...t-charges/change-your-answers-agent-charges-fixed-sum-amount-alternative-currency.spec.js
diff --git a/...nge-your-answers/agent-charges/change-your-answers-agent-charges-fixed-sum-amount.spec.js b/...nge-your-answers/agent-charges/change-your-answers-agent-charges-fixed-sum-amount.spec.js
@@ -7,7 +7,7 @@ import application from '../../../../../../../../fixtures/application';
 const {
   ROOT,
   CHECK_YOUR_ANSWERS: { EXPORT_CONTRACT },
-  EXPORT_CONTRACT: { AGENT_CHARGES_CHECK_AND_CHANGE },
+  EXPORT_CONTRACT: { HOW_MUCH_THE_AGENT_IS_CHARGING_CHECK_AND_CHANGE },
 } = INSURANCE_ROUTES;
 
 const {
@@ -55,12 +55,12 @@ context(`Insurance - Change your answers - Export contract - Summary list - Agen
   });
 
   describe('when clicking the `change` link', () => {
-    it(`should redirect to ${AGENT_CHARGES_CHECK_AND_CHANGE}`, () => {
+    it(`should redirect to ${HOW_MUCH_THE_AGENT_IS_CHARGING_CHECK_AND_CHANGE}`, () => {
       cy.navigateToUrl(url);
 
       summaryList.field(fieldId).changeLink().click();
 
-      cy.assertChangeAnswersPageUrl({ referenceNumber, route: AGENT_CHARGES_CHECK_AND_CHANGE, fieldId });
+      cy.assertChangeAnswersPageUrl({ referenceNumber, route: HOW_MUCH_THE_AGENT_IS_CHARGING_CHECK_AND_CHANGE, fieldId });
     });
   });
 
@@ -74,10 +74,7 @@ context(`Insurance - Change your answers - Export contract - Summary list - Agen
     it(`should redirect to ${EXPORT_CONTRACT}`, () => {
       summaryList.field(fieldId).changeLink().click();
 
-      cy.completeAndSubmitAgentChargesForm({
-        fixedSumMethod: true,
-        fixedSumAmount: newValueInput,
-      });
+      cy.completeAndSubmitHowMuchTheAgentIsChargingForm({ fixedSumAmount: newValueInput });
 
       cy.assertChangeAnswersPageUrl({ referenceNumber, route: EXPORT_CONTRACT, fieldId });
     });

diff --git a/...r-answers/agent-charges/change-your-answers-agent-charges-fixed-sum-to-percentage.spec.js b/...r-answers/agent-charges/change-your-answers-agent-charges-fixed-sum-to-percentage.spec.js
diff --git a/...ange-your-answers/agent-charges/change-your-answers-agent-charges-payable-country.spec.js b/...ange-your-answers/agent-charges/change-your-answers-agent-charges-payable-country.spec.js
@@ -31,7 +31,7 @@ context(`Insurance - Change your answers - Export contract - Summary list - Agen
         referenceNumber,
         isUsingAgent: true,
         agentIsCharging: true,
-        agentChargeMethodFixedSum: true,
+        agentChargeMethodPercentage: true,
       });
 
       cy.clickTaskCheckAnswers();