feat(EMS-3344): no PDF - application submission - XLSX - buyer

.github/workflows/test.yml

@@ -200,9 +200,19 @@ jobs:
             "account/sign-in/**/*.spec.js",
             "account/sign-out/**/*.spec.js",
             "account/suspended/**/*.spec.js",
-            "application-submission/*.spec.js",
-            "application-submission/multiple-policy-type/**/*.spec.js",
-            "application-submission/single-policy-type/**/*.spec.js",
+            "application-submission/multiple-policy-type/*.spec.js",
+            "application-submission/multiple-policy-type/business-conditions/*.spec.js",
+            "application-submission/multiple-policy-type/buyer-conditions/*.spec.js",
+            "application-submission/multiple-policy-type/buyer-conditions/traded-with-buyer/*.spec.js",
+            "application-submission/multiple-policy-type/export-contract-conditions/*.spec.js",
+            "application-submission/multiple-policy-type/policy-conditions/*.spec.js",
+
+            "application-submission/single-policy-type/*.spec.js",
+            "application-submission/single-policy-type/business-conditions/*.spec.js",
+            "application-submission/single-policy-type/buyer-conditions/*.spec.js",
+            "application-submission/single-policy-type/buyer-conditions/traded-with-buyer/*.spec.js",
+            "application-submission/single-policy-type/export-contract-conditions/*.spec.js",
+            "application-submission/single-policy-type/policy-conditions/*.spec.js",
             "cannot-skip-flow/**/*.spec.js",
             "check-your-answers/export-contract/*.spec.js",
             "check-your-answers/export-contract/change-your-answers/about-goods-or-services/*.spec.js",

e2e-tests/commands/insurance/assert-currency-form-fields.js

@@ -12,7 +12,9 @@ import { checkAutocompleteInput } from '../../shared-test-assertions';
 import { DZA } from '../../fixtures/countries';
 import partials from '../../partials';
 
-const { CURRENCY: { CURRENCY_CODE, ALTERNATIVE_CURRENCY_CODE } } = INSURANCE_FIELD_IDS;
+const {
+  CURRENCY: { CURRENCY_CODE, ALTERNATIVE_CURRENCY_CODE },
+} = INSURANCE_FIELD_IDS;
 
 /**
  * returns field for currency/alternative currency
@@ -107,8 +109,7 @@ const assertCurrencyFormFields = ({
     checkAutocompleteInput.rendersMultipleResults(autoCompleteField(alternativeCurrencyFieldId), 'Be');
 
     const expectedValue = `${NON_STANDARD_CURRENCY_NAME} (${NON_STANDARD_CURRENCY_CODE})`;
-    checkAutocompleteInput
-      .allowsUserToRemoveCountryAndSearchAgain(alternativeCurrencyFieldId, DZA.NAME, NON_STANDARD_CURRENCY_NAME, expectedValue);
+    checkAutocompleteInput.allowsUserToRemoveCountryAndSearchAgain(alternativeCurrencyFieldId, DZA.NAME, NON_STANDARD_CURRENCY_NAME, expectedValue);
   },
   rendersAlternativeCurrencyValidationError: ({ errorIndex = 0 }) => {
     cy.clickAlternativeCurrencyRadioOption();
@@ -119,15 +120,9 @@ const assertCurrencyFormFields = ({
 
     cy.assertRadioOptionIsChecked(option.input());
 
-    cy.checkText(
-      partials.errorSummaryListItems().eq(errorIndex),
-      errors[alternativeCurrencyFieldId].IS_EMPTY,
-    );
+    cy.checkText(partials.errorSummaryListItems().eq(errorIndex), errors[alternativeCurrencyFieldId].IS_EMPTY);
 
-    cy.checkText(
-      fieldSelector(alternativeCurrencyFieldId).errorMessage(),
-      `Error: ${errors[alternativeCurrencyFieldId].IS_EMPTY}`,
-    );
+    cy.checkText(fieldSelector(alternativeCurrencyFieldId).errorMessage(), `Error: ${errors[alternativeCurrencyFieldId].IS_EMPTY}`);
   },
   submitRadioAndAssertUrl: ({ currency, url, completeNonCurrencyFields }) => {
     if (completeNonCurrencyFields) {
@@ -156,12 +151,9 @@ const assertCurrencyFormFields = ({
     cy.assertRadioOptionIsChecked(option.input());
   },
   submitAlternativeCurrencyAndAssertUrl: (url) => {
-    cy.clickAlternativeCurrencyRadioOption();
-
-    // search for currency
-    cy.autocompleteKeyboardInput(alternativeCurrencyFieldId, NON_STANDARD_CURRENCY_NAME);
-
-    cy.clickSubmitButton();
+    cy.clickAlternativeCurrencyRadioAndSubmitCurrency({
+      fieldId: alternativeCurrencyFieldId,
+    });
 
     cy.url().should('include', url);
   },

e2e-tests/commands/insurance/complete-and-submit-alternative-currency-form.js

@@ -1,8 +1,7 @@
-import { NON_STANDARD_CURRENCY_CODE } from '../../fixtures/currencies';
 import { radios } from '../../pages/shared';
 import { INSURANCE_FIELD_IDS } from '../../constants/field-ids/insurance';
 
-const { CURRENCY_CODE, ALTERNATIVE_CURRENCY_CODE } = INSURANCE_FIELD_IDS.CURRENCY;
+const { CURRENCY_CODE } = INSURANCE_FIELD_IDS.CURRENCY;
 
 /**
  * completeAndSubmitAlternativeCurrencyForm
@@ -23,14 +22,7 @@ const completeAndSubmitAlternativeCurrencyForm = ({ isoCode, alternativeCurrency
   if (alternativeCurrency) {
     cy.clickProvideAlternativeCurrencyLink();
 
-    /**
-     * clicks alternativeCurrency radio option
-     * enters alternative currency into input
-     * submits form
-     */
-    cy.clickAlternativeCurrencyRadioOption();
-    cy.autocompleteKeyboardInput(ALTERNATIVE_CURRENCY_CODE, NON_STANDARD_CURRENCY_CODE);
-    cy.clickSubmitButton();
+    cy.clickAlternativeCurrencyRadioAndSubmitCurrency({});
   }
 };
 

e2e-tests/commands/insurance/complete-buyer-section.js

@@ -2,8 +2,11 @@
  * completeBuyerSection
  * Complete the "Buyer" section
  * @param {Boolean} viaTaskList: Start the "buyer" section from the task list.
+ * @param {Boolean} alternativeCurrency: Should submit an "alternative currency". Defaults to false.
  * @param {Boolean} hasConnectionToBuyer: Should submit "yes" to "have connection to buyer" radio. Defaults to "no".
  * @param {Boolean} exporterHasTradedWithBuyer: Submit "yes" to "have traded with buyer before" in the "working with buyer" form.
+ * @param {Boolean} outstandingPayments: Exporter has outstanding payments with the buyer
+ * @param {Boolean} failedToPay: Buyer has failed to pay the exporter on the time
  * @param {Boolean} fullyPopulatedBuyerTradingHistory: Submit all possible optional "buyer trading history" form fields.
  * @param {Boolean} hasHadCreditInsuranceCover: Submit "yes" to if export "has held credit insurance cover on the buyer in the past"
  * @param {Boolean} exporterHasBuyerFinancialAccounts: Submit "yes" to "have traded with buyer before" in the "working with buyer" form.
@@ -12,8 +15,11 @@
  */
 const completeBuyerSection = ({
   viaTaskList = true,
+  alternativeCurrency = false,
   hasConnectionToBuyer = false,
   exporterHasTradedWithBuyer = false,
+  outstandingPayments = false,
+  failedToPay = false,
   fullyPopulatedBuyerTradingHistory = false,
   hasHadCreditInsuranceCover = false,
   exporterHasBuyerFinancialAccounts = false,
@@ -27,9 +33,17 @@ const completeBuyerSection = ({
   cy.completeAndSubmitTradedWithBuyerForm({ exporterHasTradedWithBuyer });
 
   if (exporterHasTradedWithBuyer) {
+    cy.clickYesRadioInput();
+
+    if (alternativeCurrency) {
+      cy.clickProvideAlternativeCurrencyLink();
+
+      cy.clickAlternativeCurrencyRadioAndSubmitCurrency({});
+    }
+
     cy.completeAndSubmitTradingHistoryWithBuyerForm({
-      outstandingPayments: fullyPopulatedBuyerTradingHistory,
-      failedToPay: fullyPopulatedBuyerTradingHistory,
+      outstandingPayments: outstandingPayments || fullyPopulatedBuyerTradingHistory,
+      failedToPay: failedToPay || fullyPopulatedBuyerTradingHistory,
     });
   }
 

e2e-tests/commands/insurance/complete-multiple-contract-policy-form.js

@@ -3,7 +3,7 @@ import { radios, field } from '../../pages/shared';
 import application from '../../fixtures/application';
 
 const {
-  CURRENCY: { CURRENCY_CODE, ALTERNATIVE_CURRENCY_CODE },
+  CURRENCY: { CURRENCY_CODE },
   POLICY: {
     CONTRACT_POLICY: {
       REQUESTED_START_DATE,
@@ -20,11 +20,7 @@ const {
  * @param {Boolean} alternativeCurrency: Select the "alternative currency" option
  * @param {Boolean} chooseCurrency: Whether to choose a currency or not
  */
-const completeMultipleContractPolicyForm = ({
-  isoCode = application.POLICY[POLICY_CURRENCY_CODE],
-  alternativeCurrency = false,
-  chooseCurrency = true,
-}) => {
+const completeMultipleContractPolicyForm = ({ isoCode = application.POLICY[POLICY_CURRENCY_CODE], alternativeCurrency = false, chooseCurrency = true }) => {
   cy.keyboardInput(field(REQUESTED_START_DATE).dayInput(), application.POLICY[REQUESTED_START_DATE].day);
   cy.keyboardInput(field(REQUESTED_START_DATE).monthInput(), application.POLICY[REQUESTED_START_DATE].month);
   cy.keyboardInput(field(REQUESTED_START_DATE).yearInput(), application.POLICY[REQUESTED_START_DATE].year);
@@ -33,9 +29,9 @@ const completeMultipleContractPolicyForm = ({
 
   if (chooseCurrency) {
     if (alternativeCurrency) {
-      cy.clickAlternativeCurrencyRadioOption();
-
-      cy.autocompleteKeyboardInput(ALTERNATIVE_CURRENCY_CODE, isoCode);
+      cy.clickAlternativeCurrencyRadioAndCompleteCurrency({
+        currency: isoCode,
+      });
     } else {
       radios(CURRENCY_CODE, isoCode).option.label().click();
     }

e2e-tests/commands/insurance/complete-prepare-application-section-multiple-policy-type.js

@@ -6,11 +6,14 @@ const { POLICY_TYPE } = APPLICATION;
  * completePrepareApplicationMultiplePolicyType
  * Runs through the full prepare your application journey for multiple policy type
  * @param {Object} Object with flags on how to complete specific parts of the application
+ * @param {Boolean} alternativeBuyerCurrency: Should submit an "alternative currency" in the buyer section. Defaults to false.
  * @param {Boolean} differentTradingName: Should submit "yes" to "have a different trading name" in the "company details" form. Defaults to false.
  * @param {Boolean} differentTradingAddress: Should submit "yes" to "trade from a different address" in the "company details" form. Defaults to false.
  * @param {Boolean} hasCreditControlProcess: Flag whether to submit "yes" or "no" radio input in the "credit control" form. Defaults to false.
  * @param {Boolean} hasConnectionToBuyer: Should submit "yes" to "have connection to buyer" radio.
  * @param {Boolean} exporterHasTradedWithBuyer: Should submit "yes" to "have traded with buyer before" in the "working with buyer" form.
+ * @param {Boolean} buyerOutstandingPayments: Exporter has outstanding payments with the buyer
+ * @param {Boolean} buyerFailedToPayOnTime: Buyer has failed to pay the exporter on the time
  * @param {Boolean} fullyPopulatedBuyerTradingHistory: Submit all possible optional "buyer trading history" form fields.
  * @param {Boolean} hasHadCreditInsuranceCover: Submit "yes" to if export "has held credit insurance cover on the buyer in the past".
  * @param {Boolean} exporterHasBuyerFinancialAccounts: Should submit "yes" to the "have buyer financial accounts" form.
@@ -30,11 +33,14 @@ const { POLICY_TYPE } = APPLICATION;
  * @param {Boolean} submitCheckYourAnswers: Should click each section's "check your answers" submit button.
  */
 const completePrepareApplicationMultiplePolicyType = ({
+  alternativeBuyerCurrency = false,
   differentTradingName = false,
   differentTradingAddress = false,
   hasCreditControlProcess = false,
   hasConnectionToBuyer = false,
   exporterHasTradedWithBuyer = false,
+  buyerOutstandingPayments = false,
+  buyerFailedToPayOnTime = false,
   fullyPopulatedBuyerTradingHistory = false,
   hasHadCreditInsuranceCover = false,
   exporterHasBuyerFinancialAccounts = false,
@@ -61,8 +67,11 @@ const completePrepareApplicationMultiplePolicyType = ({
   });
 
   cy.completeBuyerSection({
+    alternativeCurrency: alternativeBuyerCurrency,
     hasConnectionToBuyer,
     exporterHasTradedWithBuyer,
+    outstandingPayments: buyerOutstandingPayments,
+    failedToPay: buyerFailedToPayOnTime,
     fullyPopulatedBuyerTradingHistory,
     hasHadCreditInsuranceCover,
     exporterHasBuyerFinancialAccounts,

e2e-tests/commands/insurance/complete-prepare-application-section-single-policy-type.js

@@ -6,11 +6,14 @@ const { POLICY_TYPE } = FIELD_VALUES;
  * completePrepareYourApplicationSectionSingle
  * Runs through the full prepare your application journey for a single policy type
  * @param {Object} Object with flags on how to complete specific parts of the application
+ * @param {Boolean} alternativeBuyerCurrency: Should submit an "alternative currency" in the buyer section. Defaults to false.
  * @param {Boolean} differentTradingName: Should submit "yes" to "have a different trading name" in the "company details" form. Defaults to false.
  * @param {Boolean} differentTradingAddress: Should submit "yes" to "trade from a different address" in the "company details" form. Defaults to false.
  * @param {Boolean} hasCreditControlProcess: Flag whether to submit "yes" or "no" radio input in the "credit control" form. Defaults to false.
  * @param {Boolean} hasConnectionToBuyer: Should submit "yes" to "have connection to buyer" radio.
  * @param {Boolean} exporterHasTradedWithBuyer: Should submit "yes" to "have traded with buyer before" in the "working with buyer" form.
+ * @param {Boolean} buyerOutstandingPayments: Exporter has outstanding payments with the buyer
+ * @param {Boolean} buyerFailedToPayOnTime: Buyer has failed to pay the exporter on the time
  * @param {Boolean} fullyPopulatedBuyerTradingHistory: Submit all possible optional "buyer trading history" form fields.
  * @param {Boolean} hasHadCreditInsuranceCover: Submit "yes" to if export "has held credit insurance cover on the buyer in the past".
  * @param {Boolean} exporterHasBuyerFinancialAccounts: Should submit "yes" to the "have buyer financial accounts" form.
@@ -30,11 +33,14 @@ const { POLICY_TYPE } = FIELD_VALUES;
  * @param {Boolean} submitCheckYourAnswers: Should click each section's "check your answers" submit button.
  */
 const completePrepareApplicationSinglePolicyType = ({
+  alternativeBuyerCurrency = false,
   differentTradingName = false,
   differentTradingAddress = false,
   hasCreditControlProcess = false,
   hasConnectionToBuyer,
   exporterHasTradedWithBuyer,
+  buyerOutstandingPayments = false,
+  buyerFailedToPayOnTime = false,
   fullyPopulatedBuyerTradingHistory,
   hasHadCreditInsuranceCover,
   exporterHasBuyerFinancialAccounts,
@@ -61,8 +67,11 @@ const completePrepareApplicationSinglePolicyType = ({
   });
 
   cy.completeBuyerSection({
+    alternativeCurrency: alternativeBuyerCurrency,
     hasConnectionToBuyer,
     exporterHasTradedWithBuyer,
+    outstandingPayments: buyerOutstandingPayments,
+    failedToPay: buyerFailedToPayOnTime,
     fullyPopulatedBuyerTradingHistory,
     hasHadCreditInsuranceCover,
     exporterHasBuyerFinancialAccounts,

e2e-tests/commands/insurance/complete-sign-in-and-submit-an-application.js

@@ -8,6 +8,7 @@ import completeSignInAndGoToApplication from './account/complete-sign-in-and-go-
  * 3) Complete and submit all declarations forms
  * 4) Get and return the application reference number from the URL for consumption in the tests
  * @param {Object} Object with flags on how to complete specific parts of the application
+ * - alternativeBuyerCurrency: Should submit an "alternative currency" in the buyer section. Defaults to false.
  * - differentTradingAddress: Should submit "yes" to "trade from a different address" in the "your business - company details" form. Defaults to false.
  * - policyType: Type of policy. Defaults to "single"
  * - exporterHasTradedWithBuyer: Should submit "yes" to "have traded with buyer before" in the "working with buyer" form. Defaults to "yes".
@@ -23,10 +24,16 @@ import completeSignInAndGoToApplication from './account/complete-sign-in-and-go-
  * - isUsingAgent: Should submit "yes" to "using an agent" form.
  * - agentIsCharging: Should submit "yes" to "agent is charging" in the "agent details" form.
  * - agentChargeMethodFixedSum: Agent charge method is "fixed sum"
- * - agentChargeMethodPercentage: Agent charge method is "percentage"
+ * - hasConnectionToBuyer: Should submit "yes" to "have connection to buyer" radio.
+ * - buyerOutstandingPayments: Exporter has outstanding payments with the buyer
+ * - buyerFailedToPayOnTime: Buyer has failed to pay the exporter on the time
+ * - fullyPopulatedBuyerTradingHistory: Submit all possible optional "buyer trading history" form fields.
+ * - hasHadCreditInsuranceCover: Submit "yes" to if export "has held credit insurance cover on the buyer in the past".
+ * - exporterHasBuyerFinancialAccounts: Should submit "yes" to the "have buyer financial accounts" form.
  * @return {String} Application reference number
  */
 const completeSignInAndSubmitAnApplication = ({
+  alternativeBuyerCurrency = false,
   differentTradingName = false,
   differentTradingAddress = false,
   policyType = APPLICATION.POLICY_TYPE.SINGLE,
@@ -44,11 +51,17 @@ const completeSignInAndSubmitAnApplication = ({
   agentIsCharging = false,
   agentChargeMethodFixedSum = false,
   agentChargeMethodPercentage = false,
-  agentChargeMethod,
+  hasConnectionToBuyer = false,
+  buyerOutstandingPayments = false,
+  buyerFailedToPayOnTime = false,
+  fullyPopulatedBuyerTradingHistory = false,
+  hasHadCreditInsuranceCover = false,
+  exporterHasBuyerFinancialAccounts = false,
 }) => {
   completeSignInAndGoToApplication({ totalContractValueOverThreshold }).then(({ referenceNumber }) => {
     if (policyType === APPLICATION.POLICY_TYPE.MULTIPLE) {
       cy.completePrepareApplicationMultiplePolicyType({
+        alternativeBuyerCurrency,
         differentTradingName,
         differentTradingAddress,
         exporterHasTradedWithBuyer,
@@ -64,10 +77,16 @@ const completeSignInAndSubmitAnApplication = ({
         agentIsCharging,
         agentChargeMethodFixedSum,
         agentChargeMethodPercentage,
-        agentChargeMethod,
+        hasConnectionToBuyer,
+        buyerOutstandingPayments,
+        buyerFailedToPayOnTime,
+        fullyPopulatedBuyerTradingHistory,
+        hasHadCreditInsuranceCover,
+        exporterHasBuyerFinancialAccounts,
       });
     } else {
       cy.completePrepareApplicationSinglePolicyType({
+        alternativeBuyerCurrency,
         differentTradingName,
         differentTradingAddress,
         exporterHasTradedWithBuyer,
@@ -82,7 +101,12 @@ const completeSignInAndSubmitAnApplication = ({
         isUsingAgent,
         agentChargeMethodFixedSum,
         agentChargeMethodPercentage,
-        agentChargeMethod,
+        hasConnectionToBuyer,
+        buyerOutstandingPayments,
+        buyerFailedToPayOnTime,
+        fullyPopulatedBuyerTradingHistory,
+        hasHadCreditInsuranceCover,
+        exporterHasBuyerFinancialAccounts,
       });
     }
     cy.completeAndSubmitCheckYourAnswers();

e2e-tests/commands/insurance/complete-single-contract-policy-form.js

@@ -3,7 +3,7 @@ import { radios, field } from '../../pages/shared';
 import application from '../../fixtures/application';
 
 const {
-  CURRENCY: { CURRENCY_CODE, ALTERNATIVE_CURRENCY_CODE },
+  CURRENCY: { CURRENCY_CODE },
   POLICY: {
     CONTRACT_POLICY: {
       REQUESTED_START_DATE,
@@ -20,11 +20,7 @@ const {
  * @param {Boolean} alternativeCurrency: Select the "alternative currency" option
  * @param {Boolean} chooseCurrency: Whether to choose a currency or not
  */
-const completeSingleContractPolicyForm = ({
-  isoCode = application.POLICY[POLICY_CURRENCY_CODE],
-  alternativeCurrency = false,
-  chooseCurrency = true,
-}) => {
+const completeSingleContractPolicyForm = ({ isoCode = application.POLICY[POLICY_CURRENCY_CODE], alternativeCurrency = false, chooseCurrency = true }) => {
   cy.keyboardInput(field(REQUESTED_START_DATE).dayInput(), application.POLICY[REQUESTED_START_DATE].day);
   cy.keyboardInput(field(REQUESTED_START_DATE).monthInput(), application.POLICY[REQUESTED_START_DATE].month);
   cy.keyboardInput(field(REQUESTED_START_DATE).yearInput(), application.POLICY[REQUESTED_START_DATE].year);
@@ -37,7 +33,7 @@ const completeSingleContractPolicyForm = ({
     if (alternativeCurrency) {
       cy.clickAlternativeCurrencyRadioOption();
 
-      cy.autocompleteKeyboardInput(ALTERNATIVE_CURRENCY_CODE, isoCode);
+      cy.completeAlternativeCurrencyField({ currency: isoCode });
     } else {
       radios(CURRENCY_CODE, isoCode).option.label().click();
     }

e2e-tests/commands/shared-commands/form/click-alternative-currency-radio-and-complete-currency.js

@@ -0,0 +1,13 @@
+/**
+ * clickAlternativeCurrencyRadioAndCompleteCurrency
+ * Click an "alternative currency" radio and complete the "currency" field.
+ * @param {String} fieldId: Field ID
+ * @param {String} currency: Currency
+ */
+const clickAlternativeCurrencyRadioAndCompleteCurrency = ({ fieldId, currency }) => {
+  cy.clickAlternativeCurrencyRadioOption();
+
+  cy.completeAlternativeCurrencyField({ fieldId, currency });
+};
+
+export default clickAlternativeCurrencyRadioAndCompleteCurrency;