chore(EMS-3789): dry cypress commands - task link clicks (#3000)

* chore(EMS-3789): dry cypress commands - task links - check your answers * chore(EMS-3789): dry cypress commands - task links - declarations/submit * chore(EMS-3789): dry cypress commands - task links
UK-Export-Finance · Aug 23, 2024 · 3434e25 · 3434e25
1 parent 1db7568
commit 3434e25
Show file tree

Hide file tree

Showing 117 changed files with 196 additions and 659 deletions.
diff --git a/e2e-tests/commands/insurance/check-your-answers/complete-and-submit-check-your-answers.js b/e2e-tests/commands/insurance/check-your-answers/complete-and-submit-check-your-answers.js
@@ -1,9 +1,3 @@
-import partials from '../../../partials';
-
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.submitApplication.tasks.checkAnswers;
-
 /**
  * completeAndSubmitCheckYourAnswers
  * Complete and submit all "Application - Check your answers" forms:
@@ -13,7 +7,7 @@ const task = taskList.submitApplication.tasks.checkAnswers;
  * 4) Export contract
  */
 const completeAndSubmitCheckYourAnswers = () => {
-  task.link().click();
+  cy.clickTaskCheckAnswers();
 
   cy.completeAndSubmitMultipleCheckYourAnswers({ count: 4 });
 };

diff --git a/e2e-tests/commands/insurance/complete-declarations.js b/e2e-tests/commands/insurance/complete-declarations.js
@@ -1,18 +1,13 @@
-import partials from '../../partials';
 import { FIELD_VALUES } from '../../constants';
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.submitApplication.tasks.declarationsAndSubmit;
-
 /**
  * completeDeclarations
  * Runs through the full declarations journey
  * @param {Object} Object with flags on how to complete specific declaration forms.
  * - exportingWithCodeOfConduct: Should submit "yes" in the "exporting with code of conduct" form. Defaults to "yes".
  */
 const completeDeclarations = ({ hasAntiBriberyCodeOfConduct = true, exportingWithCodeOfConduct = true }) => {
-  task.link().click();
+  cy.clickTaskDeclarationsAndSubmit();
 
   cy.completeAndSubmitDeclarationConfidentiality();
 

diff --git a/e2e-tests/commands/insurance/declarations/complete-and-submit-declarations-forms.js b/e2e-tests/commands/insurance/declarations/complete-and-submit-declarations-forms.js
@@ -1,7 +1,3 @@
-import partials from '../../../partials';
-
-const { taskList } = partials.insurancePartials;
-
 /**
  * completeAndDeclarationsForms
  * completes declarations forms up to the specified form to stop at
@@ -15,7 +11,7 @@ const completeAndSubmitDeclarationsForms = ({ formToStopAt, referenceNumber }) =
   cy.completeAndSubmitCheckYourAnswers();
 
   // go to the page we want to test.
-  taskList.submitApplication.tasks.declarationsAndSubmit.link().click();
+  cy.clickTaskDeclarationsAndSubmit();
 
   const steps = [
     { name: 'confidentiality', action: () => cy.completeAndSubmitDeclarationConfidentiality() },

diff --git a/e2e-tests/commands/insurance/start-insurance-export-contract-section.js b/e2e-tests/commands/insurance/start-insurance-export-contract-section.js
@@ -1,10 +1,5 @@
-import partials from '../../partials';
 import { startNowLink } from '../../pages/shared';
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.prepareApplication.tasks.exportContract;
-
 /**
  * startInsuranceExportContractSection
  * Start the "export contract" section of an application.
@@ -14,7 +9,7 @@ const task = taskList.prepareApplication.tasks.exportContract;
  */
 const startInsuranceExportContractSection = ({ viaTaskList = true }) => {
   if (viaTaskList) {
-    task.link().click();
+    cy.clickTaskExportContract();
   }
 
   startNowLink().click();

diff --git a/e2e-tests/commands/insurance/start-insurance-policy-section.js b/e2e-tests/commands/insurance/start-insurance-policy-section.js
@@ -1,10 +1,5 @@
-import partials from '../../partials';
 import { startNowLink } from '../../pages/shared';
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.prepareApplication.tasks.policy;
-
 /**
  * startInsurancePolicySection
  * Start the "insurance policy" section of an application.
@@ -14,7 +9,7 @@ const task = taskList.prepareApplication.tasks.policy;
  */
 const startInsurancePolicySection = ({ viaTaskList = true }) => {
   if (viaTaskList) {
-    task.link().click();
+    cy.clickTaskPolicy();
   }
 
   startNowLink().click();

diff --git a/e2e-tests/commands/insurance/start-your-business-section.js b/e2e-tests/commands/insurance/start-your-business-section.js
@@ -1,10 +1,5 @@
-import partials from '../../partials';
 import { startNowLink } from '../../pages/shared';
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.prepareApplication.tasks.business;
-
 /**
  * startYourBusinessSection
  * Start the "your business" section of an application.
@@ -14,7 +9,7 @@ const task = taskList.prepareApplication.tasks.business;
  */
 const startYourBusinessSection = ({ viaTaskList = true }) => {
   if (viaTaskList) {
-    task.link().click();
+    cy.clickTaskBusiness();
   }
 
   startNowLink().click();

diff --git a/e2e-tests/commands/insurance/start-your-buyer-section.js b/e2e-tests/commands/insurance/start-your-buyer-section.js
@@ -1,10 +1,5 @@
-import partials from '../../partials';
 import { startNowLink } from '../../pages/shared';
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.prepareApplication.tasks.buyer;
-
 /**
  * startInsuranceYourBuyerSection
  * Start the "your buyer" section of an application.
@@ -14,7 +9,7 @@ const task = taskList.prepareApplication.tasks.buyer;
  */
 const startInsuranceYourBuyerSection = ({ viaTaskList = true }) => {
   if (viaTaskList) {
-    task.link().click();
+    cy.clickTaskBuyer();
   }
 
   startNowLink().click();

diff --git a/e2e-tests/commands/shared-commands/click-events/index.js b/e2e-tests/commands/shared-commands/click-events/index.js
@@ -11,4 +11,11 @@ Cypress.Commands.add('clickYesRadioInput', require('./click-yes-radio-input'));
 Cypress.Commands.add('clickProvideAlternativeCurrencyLink', require('./click-provide-alternative-currency-link'));
 Cypress.Commands.add('clickAlternativeCurrencyRadioOption', require('./click-alternative-currency-radio-option'));
 
+Cypress.Commands.add('clickTaskBusiness', require('./tasks/click-task-business'));
+Cypress.Commands.add('clickTaskBuyer', require('./tasks/click-task-buyer'));
+Cypress.Commands.add('clickTaskPolicy', require('./tasks/click-task-policy'));
+Cypress.Commands.add('clickTaskExportContract', require('./tasks/click-task-export-contract'));
+Cypress.Commands.add('clickTaskCheckAnswers', require('./tasks/click-task-check-answers'));
+Cypress.Commands.add('clickTaskDeclarationsAndSubmit', require('./tasks/click-task-declarations-and-submit'));
+
 Cypress.Commands.add('rejectAnalyticsCookies', analytics.rejectAnalyticsCookies);
diff --git a/e2e-tests/commands/shared-commands/click-events/tasks/click-task-business.js b/e2e-tests/commands/shared-commands/click-events/tasks/click-task-business.js
@@ -0,0 +1,13 @@
+import taskList from '../../../../partials/insurance/taskList';
+
+/**
+ * clickTaskBusiness
+ * Click the "Business" task link
+ */
+const clickTaskBusiness = () => {
+  const task = taskList.prepareApplication.tasks.business;
+
+  task.link().click();
+};
+
+export default clickTaskBusiness;
diff --git a/e2e-tests/commands/shared-commands/click-events/tasks/click-task-buyer.js b/e2e-tests/commands/shared-commands/click-events/tasks/click-task-buyer.js
@@ -0,0 +1,13 @@
+import taskList from '../../../../partials/insurance/taskList';
+
+/**
+ * clickTaskBuyer
+ * Click the "Buyer" task link
+ */
+const clickTaskBuyer = () => {
+  const task = taskList.prepareApplication.tasks.buyer;
+
+  task.link().click();
+};
+
+export default clickTaskBuyer;
diff --git a/e2e-tests/commands/shared-commands/click-events/tasks/click-task-check-answers.js b/e2e-tests/commands/shared-commands/click-events/tasks/click-task-check-answers.js
@@ -0,0 +1,13 @@
+import taskList from '../../../../partials/insurance/taskList';
+
+/**
+ * clickTaskCheckAnswers
+ * Click the "Check answers" task link
+ */
+const clickTaskCheckAnswers = () => {
+  const task = taskList.submitApplication.tasks.checkAnswers;
+
+  task.link().click();
+};
+
+export default clickTaskCheckAnswers;
diff --git a/e2e-tests/commands/shared-commands/click-events/tasks/click-task-declarations-and-submit.js b/e2e-tests/commands/shared-commands/click-events/tasks/click-task-declarations-and-submit.js
@@ -0,0 +1,13 @@
+import taskList from '../../../../partials/insurance/taskList';
+
+/**
+ * clickTaskDeclarationsAndSubmit
+ * Click the "Declarations and submit" task link
+ */
+const clickTaskDeclarationsAndSubmit = () => {
+  const task = taskList.submitApplication.tasks.declarationsAndSubmit;
+
+  task.link().click();
+};
+
+export default clickTaskDeclarationsAndSubmit;
diff --git a/e2e-tests/commands/shared-commands/click-events/tasks/click-task-export-contract.js b/e2e-tests/commands/shared-commands/click-events/tasks/click-task-export-contract.js
@@ -0,0 +1,13 @@
+import taskList from '../../../../partials/insurance/taskList';
+
+/**
+ * clickTaskExportContract
+ * Click the "Export contract" task link
+ */
+const clickTaskExportContract = () => {
+  const task = taskList.prepareApplication.tasks.exportContract;
+
+  task.link().click();
+};
+
+export default clickTaskExportContract;
diff --git a/e2e-tests/commands/shared-commands/click-events/tasks/click-task-policy.js b/e2e-tests/commands/shared-commands/click-events/tasks/click-task-policy.js
@@ -0,0 +1,13 @@
+import taskList from '../../../../partials/insurance/taskList';
+
+/**
+ * clickTaskPolicy
+ * Click the "Policy" task link
+ */
+const clickTaskPolicy = () => {
+  const task = taskList.prepareApplication.tasks.policy;
+
+  task.link().click();
+};
+
+export default clickTaskPolicy;
diff --git a/...es/change-your-answers-about-goods-or-services-final-destination-known-to-unknown.spec.js b/...es/change-your-answers-about-goods-or-services-final-destination-known-to-unknown.spec.js
@@ -1,5 +1,4 @@
 import { status, summaryList } from '../../../../../../../../pages/shared';
-import partials from '../../../../../../../../partials';
 import { DEFAULT } from '../../../../../../../../content-strings';
 import FIELD_IDS from '../../../../../../../../constants/field-ids/insurance/export-contract';
 import { INSURANCE_ROUTES } from '../../../../../../../../constants/routes/insurance';
@@ -14,10 +13,6 @@ const {
   ABOUT_GOODS_OR_SERVICES: { FINAL_DESTINATION: FIELD_ID },
 } = FIELD_IDS;
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.submitApplication.tasks.checkAnswers;
-
 const getFieldVariables = (referenceNumber) => ({
   route: ABOUT_GOODS_OR_SERVICES_CHECK_AND_CHANGE,
   checkYourAnswersRoute: EXPORT_CONTRACT,
@@ -42,7 +37,7 @@ context(
 
         cy.completePrepareApplicationSinglePolicyType({ referenceNumber });
 
-        task.link().click();
+        cy.clickTaskCheckAnswers();
 
         // To get past previous "Check your answers" pages
         cy.completeAndSubmitMultipleCheckYourAnswers({ count: 3 });

diff --git a/...-your-answers/about-goods-or-services/change-your-answers-about-goods-or-services.spec.js b/...-your-answers/about-goods-or-services/change-your-answers-about-goods-or-services.spec.js
@@ -1,5 +1,4 @@
 import { field, status, summaryList } from '../../../../../../../../pages/shared';
-import partials from '../../../../../../../../partials';
 import FIELD_IDS from '../../../../../../../../constants/field-ids/insurance/export-contract';
 import { INSURANCE_ROUTES } from '../../../../../../../../constants/routes/insurance';
 import application from '../../../../../../../../fixtures/application';
@@ -15,10 +14,6 @@ const {
   ABOUT_GOODS_OR_SERVICES: { DESCRIPTION, FINAL_DESTINATION },
 } = FIELD_IDS;
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.submitApplication.tasks.checkAnswers;
-
 const getFieldVariables = (fieldId, referenceNumber) => ({
   changeLink: summaryList.field(fieldId).changeLink,
   checkYourAnswersRoute: EXPORT_CONTRACT,
@@ -46,7 +41,7 @@ context('Insurance - Change your answers - Export contract - Summary list - Abou
         finalDestinationKnown: true,
       });
 
-      task.link().click();
+      cy.clickTaskCheckAnswers();
 
       // To get past previous "Check your answers" pages
       cy.completeAndSubmitMultipleCheckYourAnswers({ count: 3 });

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
@@ -1,5 +1,4 @@
 import { summaryList } from '../../../../../../../../pages/shared';
-import partials from '../../../../../../../../partials';
 import FIELD_IDS from '../../../../../../../../constants/field-ids/insurance/export-contract';
 import { INSURANCE_ROUTES } from '../../../../../../../../constants/routes/insurance';
 import application from '../../../../../../../../fixtures/application';
@@ -16,10 +15,6 @@ const {
   AGENT_CHARGES: { FIXED_SUM_AMOUNT, PAYABLE_COUNTRY_CODE },
 } = FIELD_IDS;
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.submitApplication.tasks.checkAnswers;
-
 const fieldId = FIXED_SUM_AMOUNT;
 
 const baseUrl = Cypress.config('baseUrl');
@@ -41,7 +36,7 @@ context(
           agentChargeMethodFixedSum: true,
         });
 
-        task.link().click();
+        cy.clickTaskCheckAnswers();
 
         // To get past previous "Check your answers" pages
         cy.completeAndSubmitMultipleCheckYourAnswers({ count: 3 });

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
@@ -1,5 +1,4 @@
 import { status, summaryList } from '../../../../../../../../pages/shared';
-import partials from '../../../../../../../../partials';
 import FIELD_IDS from '../../../../../../../../constants/field-ids/insurance/export-contract';
 import { INSURANCE_ROUTES } from '../../../../../../../../constants/routes/insurance';
 import formatCurrency from '../../../../../../../../helpers/format-currency';
@@ -15,10 +14,6 @@ const {
   AGENT_CHARGES: { FIXED_SUM_AMOUNT },
 } = FIELD_IDS;
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.submitApplication.tasks.checkAnswers;
-
 const fieldId = FIXED_SUM_AMOUNT;
 
 const baseUrl = Cypress.config('baseUrl');
@@ -38,7 +33,7 @@ context(`Insurance - Change your answers - Export contract - Summary list - Agen
         agentChargeMethodFixedSum: true,
       });
 
-      task.link().click();
+      cy.clickTaskCheckAnswers();
 
       // To get past previous "Check your answers" pages
       cy.completeAndSubmitMultipleCheckYourAnswers({ count: 3 });

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
@@ -1,5 +1,4 @@
 import { status, summaryList } from '../../../../../../../../pages/shared';
-import partials from '../../../../../../../../partials';
 import FIELD_IDS from '../../../../../../../../constants/field-ids/insurance/export-contract';
 import { INSURANCE_ROUTES } from '../../../../../../../../constants/routes/insurance';
 import checkSummaryList from '../../../../../../../../commands/insurance/check-export-contract-summary-list';
@@ -14,10 +13,6 @@ const {
   AGENT_CHARGES: { FIXED_SUM_AMOUNT, PERCENTAGE_CHARGE, PAYABLE_COUNTRY_CODE },
 } = FIELD_IDS;
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.submitApplication.tasks.checkAnswers;
-
 const baseUrl = Cypress.config('baseUrl');
 
 context('Insurance - Change your answers - Export contract - Summary list - Agent charges - Fixed sum to percentage', () => {
@@ -35,7 +30,7 @@ context('Insurance - Change your answers - Export contract - Summary list - Agen
         agentChargeMethodFixedSum: true,
       });
 
-      task.link().click();
+      cy.clickTaskCheckAnswers();
 
       // To get past previous "Check your answers" pages
       cy.completeAndSubmitMultipleCheckYourAnswers({ count: 3 });

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
@@ -1,5 +1,4 @@
 import { status, summaryList } from '../../../../../../../../pages/shared';
-import partials from '../../../../../../../../partials';
 import FIELD_IDS from '../../../../../../../../constants/field-ids/insurance/export-contract';
 import { INSURANCE_ROUTES } from '../../../../../../../../constants/routes/insurance';
 import { XAD } from '../../../../../../../../fixtures/countries';
@@ -14,10 +13,6 @@ const {
   AGENT_CHARGES: { PAYABLE_COUNTRY_CODE },
 } = FIELD_IDS;
 
-const { taskList } = partials.insurancePartials;
-
-const task = taskList.submitApplication.tasks.checkAnswers;
-
 const NEW_COUNTRY_INPUT = XAD.NAME;
 
 const fieldId = PAYABLE_COUNTRY_CODE;
@@ -39,7 +34,7 @@ context(`Insurance - Change your answers - Export contract - Summary list - Agen
         agentChargeMethodFixedSum: true,
       });
 
-      task.link().click();
+      cy.clickTaskCheckAnswers();
 
       // To get past previous "Check your answers" pages
       cy.completeAndSubmitMultipleCheckYourAnswers({ count: 3 });