chore(EMS-3464): navigateToSignInAndSubmitForm command (#2999)

* chore(EMS-3464): rename misleading login command to navigateToRootUrl

* chore(EMS-3464): dry navigateToSignInAndSubmitForm command

* chore(EMS-3464): fix/update cypress command

* chore(EMS-3464): fix/update e2e command

Author: ttbarnes

e2e-tests/commands/insurance/account/navigate-to-sign-in-and-submit-form.js

@@ -0,0 +1,22 @@
+import { ACCOUNT as ACCOUNT_ROUTES } from '../../../constants/routes/insurance/account';
+
+const {
+  SIGN_IN: { ROOT: SIGN_IN_ROOT },
+} = ACCOUNT_ROUTES;
+
+const baseUrl = Cypress.config('baseUrl');
+
+const signInUrl = `${baseUrl}${SIGN_IN_ROOT}`;
+
+/**
+ * navigateToSignInAndSubmitForm
+ * 1) Navigate to the sign in form.
+ * 2) Complete and submit the form.
+ */
+const navigateToSignInAndSubmitForm = () => {
+  cy.navigateToUrl(signInUrl);
+
+  cy.completeAndSubmitSignInAccountForm({ assertRedirectUrl: false });
+};
+
+export default navigateToSignInAndSubmitForm;

e2e-tests/commands/login.js

@@ -0,0 +1,11 @@
+import { ROUTES } from '../constants';
+
+/**
+ * navigateToRootUrl
+ * Navigate to the root URL.
+ */
+const navigateToRootUrl = () => {
+  cy.navigateToUrl(ROUTES.ROOT);
+};
+
+export default navigateToRootUrl;

e2e-tests/commands/navigate-to-root-url.js

@@ -1,7 +1,7 @@
 Cypress.Commands.add('accountAddAndGetOTP', require('../../insurance/account/add-and-get-OTP'));
-Cypress.Commands.add('createAccount', require('../../insurance/account/create-account'));
 Cypress.Commands.add('completeSignInAndGoToApplication', require('../../insurance/account/complete-sign-in-and-go-to-application'));
 Cypress.Commands.add('completeAndSubmitSignInAccountForm', require('../../insurance/account/complete-and-submit-sign-in-account-form'));
 Cypress.Commands.add('completeSignInAndOTP', require('../../insurance/account/complete-sign-in-and-otp'));
-Cypress.Commands.add('login', require('../../login'));
+Cypress.Commands.add('createAccount', require('../../insurance/account/create-account'));
+Cypress.Commands.add('navigateToSignInAndSubmitForm', require('../../insurance/account/navigate-to-sign-in-and-submit-form'));
 Cypress.Commands.add('signInAndAssertAllSectionsUrl', require('../../insurance/account/sign-in-and-assert-all-sections-url'));

e2e-tests/commands/shared-commands/account/index.js

@@ -9,7 +9,8 @@ import './form';
 import './intercept';
 import './url';
 
-Cypress.Commands.add('saveSession', require('../save-session'));
+Cypress.Commands.add('autocompleteKeyboardInput', require('../autocomplete-keyboard-input'));
 Cypress.Commands.add('corePageChecks', require('../core-page-checks'));
 Cypress.Commands.add('keyboardInput', require('../keyboard-input'));
-Cypress.Commands.add('autocompleteKeyboardInput', require('../autocomplete-keyboard-input'));
+Cypress.Commands.add('navigateToRootUrl', require('../navigate-to-root-url'));
+Cypress.Commands.add('saveSession', require('../save-session'));

e2e-tests/commands/shared-commands/index.js

@@ -34,7 +34,7 @@ context(`Insurance - Account - Sign in - expired verification and ${IS_INACTIVE}
 
     /**
      * navigate to the sign in page,
-     * without a verified  account.
+     * without a verified account.
      */
     cy.clickSignInButtonLink();
 
@@ -78,9 +78,7 @@ context(`Insurance - Account - Sign in - expired verification and ${IS_INACTIVE}
     });
 
     it(`should redirect to ${CONFIRM_EMAIL_RESENT}`, () => {
-      cy.navigateToUrl(signInUrl);
-
-      cy.completeAndSubmitSignInAccountForm({ assertRedirectUrl: false });
+      cy.navigateToSignInAndSubmitForm();
 
       const expectedUrl = `${confirmEmailResentUrl}?id=${account.id}`;
 

e2e-tests/insurance/cypress/e2e/journeys/account/sign-in/account-sign-in-with-an-expired-verification-inactive-state.spec.js

@@ -31,7 +31,7 @@ context('Insurance - Account - Sign in - expired verification', () => {
 
     /**
      * navigate to the sign in page,
-     * without a verified  account.
+     * without a verified account.
      */
     cy.clickSignInButtonLink();
 
@@ -63,9 +63,7 @@ context('Insurance - Account - Sign in - expired verification', () => {
     });
 
     it(`should redirect to ${CONFIRM_EMAIL_RESENT}`, () => {
-      cy.navigateToUrl(signInUrl);
-
-      cy.completeAndSubmitSignInAccountForm({ assertRedirectUrl: false });
+      cy.navigateToSignInAndSubmitForm();
 
       const expectedUrl = `${confirmEmailResentUrl}?id=${account.id}`;
 

e2e-tests/insurance/cypress/e2e/journeys/account/sign-in/account-sign-in-with-an-expired-verification.spec.js

@@ -29,7 +29,7 @@ context('Insurance - Account - Sign in - unverified account', () => {
 
     /**
      * navigate to the sign in page,
-     * without a verified  account.
+     * without a verified account.
      */
     cy.clickSignInButtonLink();
 
@@ -51,9 +51,7 @@ context('Insurance - Account - Sign in - unverified account', () => {
     });
 
     it(`should redirect to ${CONFIRM_EMAIL_RESENT}`, () => {
-      cy.navigateToUrl(signInUrl);
-
-      cy.completeAndSubmitSignInAccountForm({ assertRedirectUrl: false });
+      cy.navigateToSignInAndSubmitForm();
 
       const expectedUrl = `${confirmEmailResentUrl}?id=${account.id}`;
 

e2e-tests/insurance/cypress/e2e/journeys/account/sign-in/account-sign-in-with-an-unverified-account.spec.js

@@ -65,9 +65,7 @@ context('Insurance - Account - Sign in - Submitting the form with invalid creden
     before(() => {
       cy.saveSession();
 
-      cy.navigateToUrl(signInUrl);
-
-      cy.completeAndSubmitSignInAccountForm({ assertRedirectUrl: false });
+      cy.navigateToSignInAndSubmitForm();
     });
 
     it(`should redirect to ${SUSPENDED_ROOT} with ID query param`, () => {

e2e-tests/insurance/cypress/e2e/journeys/account/sign-in/sign-in-retry/account-sign-in-retry-maximum-retries-with-invalid-credentials-suspends-account.spec.js

@@ -21,7 +21,7 @@ context('Cookies saved page - Insurance', () => {
   const url = `${baseUrl}${COOKIES_SAVED}`;
 
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     cy.navigateToCheckIfEligibleUrl();
 

e2e-tests/insurance/cypress/e2e/journeys/cookies-saved.spec.js

@@ -8,7 +8,7 @@ context('Cookies consent - accept', () => {
   const url = `${baseUrl}${ROUTES.QUOTE.BUYER_COUNTRY}`;
 
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     cy.assertUrl(url);
   });

e2e-tests/quote/cypress/e2e/journeys/cookies-consent/banner/cookies-consent-accept.spec.js

@@ -8,7 +8,7 @@ context('Cookies consent - reject', () => {
   const url = `${baseUrl}${ROUTES.QUOTE.BUYER_COUNTRY}`;
 
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     cy.assertUrl(url);
   });

e2e-tests/quote/cypress/e2e/journeys/cookies-consent/banner/cookies-consent-reject.spec.js

@@ -14,7 +14,7 @@ const baseUrl = Cypress.config('baseUrl');
 
 context('Cookies consent - initial/default', () => {
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     const expectedUrl = `${baseUrl}${BUYER_COUNTRY}`;
 
@@ -38,7 +38,7 @@ context('Cookies consent - initial/default', () => {
 
         cy.checkText(partials.cookieBanner.heading(), `${COOKIES_CONSENT.HEADING_INTRO} ${PRODUCT.DESCRIPTION.QUOTE}`);
 
-        cy.login();
+        cy.navigateToRootUrl();
       });
     });
 

e2e-tests/quote/cypress/e2e/journeys/cookies-consent/banner/cookies-consent.spec.js

@@ -17,7 +17,7 @@ context('Cookies consent - change via banner and cookies page', () => {
     cy.clearCookies();
     Cypress.session.clearAllSavedSessions();
 
-    cy.login();
+    cy.navigateToRootUrl();
 
     cy.saveSession();
   });

e2e-tests/quote/cypress/e2e/journeys/cookies-consent/change-cookies-consent-via-banner-and-cookies-page.spec.js

@@ -3,7 +3,7 @@ import { FOOTER } from '../../../../content-strings';
 
 context('Footer', () => {
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     cy.saveSession();
   });

e2e-tests/quote/cypress/e2e/journeys/footer.spec.js

@@ -2,7 +2,7 @@ import partials from '../../../../partials';
 
 context('Give feedback link - As an exporter, I want to provide feedback about this service', () => {
   before(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     partials.phaseBanner.feedbackLink().click();
   });

e2e-tests/quote/cypress/e2e/journeys/give-feedback.spec.js

@@ -3,7 +3,7 @@ import { LINKS } from '../../../../content-strings';
 
 context('Privacy link - as en exporter, I want to read the privacy policy', () => {
   before(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     partials.footer.supportLinks.privacy().click();
   });

e2e-tests/quote/cypress/e2e/journeys/privacy.spec.js

@@ -31,7 +31,7 @@ const baseUrl = Cypress.config('baseUrl');
 
 context('Accessibility statement page - Quote', () => {
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     partials.footer.supportLinks.accessibilityStatement().click();
     cy.assertUrl(`${baseUrl}${ROUTES.ACCESSIBILITY_STATEMENT}`);

e2e-tests/quote/cypress/e2e/journeys/quote/accessibility-statement.spec.js

@@ -15,7 +15,7 @@ context(
     const url = `${baseUrl}${BUYER_BODY}`;
 
     before(() => {
-      cy.login();
+      cy.navigateToRootUrl();
       cy.completeAndSubmitBuyerCountryForm({});
 
       cy.assertUrl(url);

e2e-tests/quote/cypress/e2e/journeys/quote/buyer-body/buyer-body-answer-yes.spec.js

@@ -19,7 +19,7 @@ const url = `${baseUrl}${BUYER_BODY}`;
 
 context('Buyer body page - as an exporter, I want to check if I can get an EXIP online quote for my buyers country', () => {
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
     cy.completeAndSubmitBuyerCountryForm({});
 
     cy.assertUrl(url);

e2e-tests/quote/cypress/e2e/journeys/quote/buyer-body/buyer-body.spec.js

@@ -18,7 +18,7 @@ const baseUrl = Cypress.config('baseUrl');
 
 context('Buyer country page - as an exporter, I want to check if UKEF issue credit insurance cover for where my buyer is based', () => {
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     const expectedUrl = `${baseUrl}${BUYER_COUNTRY}`;
 

e2e-tests/quote/cypress/e2e/journeys/quote/buyer-country/buyer-country.spec.js

@@ -12,7 +12,7 @@ const baseUrl = Cypress.config('baseUrl');
 
 context('Cannot apply exit page', () => {
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
     cy.completeAndSubmitBuyerCountryForm({});
     cy.completeAndSubmitBuyerBodyForm();
     cy.completeAndSubmitExporterLocationForm();

e2e-tests/quote/cypress/e2e/journeys/quote/cannot-apply-page.spec.js

@@ -21,7 +21,7 @@ context(
     const url = `${baseUrl}${TELL_US_ABOUT_YOUR_POLICY}`;
 
     const completePreviousForms = () => {
-      cy.login();
+      cy.navigateToRootUrl();
 
       cy.completeAndSubmitBuyerCountryForm({});
       cy.completeAndSubmitBuyerBodyForm();

e2e-tests/quote/cypress/e2e/journeys/quote/change-your-answers/change-policy-type-multiple-times-via-back-button.spec.js

@@ -27,7 +27,7 @@ context('Change your answers (export fields) - as an exporter, I want to change
   const url = `${baseUrl}${CHECK_YOUR_ANSWERS}`;
 
   before(() => {
-    cy.login();
+    cy.navigateToRootUrl();
     cy.submitQuoteAnswersHappyPathSinglePolicy({});
     cy.assertUrl(url);
   });

e2e-tests/quote/cypress/e2e/journeys/quote/change-your-answers/change-your-answers-export-fields.spec.js

@@ -17,7 +17,7 @@ context('Change your answers (policy credit period field) - as an exporter, I wa
   const url = `${baseUrl}${CHECK_YOUR_ANSWERS}`;
 
   before(() => {
-    cy.login();
+    cy.navigateToRootUrl();
     cy.submitQuoteAnswersHappyPathMultiplePolicy();
     cy.assertUrl(url);
   });

e2e-tests/quote/cypress/e2e/journeys/quote/change-your-answers/change-your-answers-policy-fields-multi-policy-credit-period.spec.js

@@ -65,7 +65,7 @@ context('Change your answers - as an exporter, I want to change the details befo
 
   context('Policy type and length fields - user flow', () => {
     before(() => {
-      cy.login();
+      cy.navigateToRootUrl();
       cy.submitQuoteAnswersHappyPathSinglePolicy({});
 
       cy.assertUrl(url);
@@ -108,7 +108,7 @@ context('Change your answers - as an exporter, I want to change the details befo
 
   context('Policy type and length fields - check new answers', () => {
     beforeEach(() => {
-      cy.login();
+      cy.navigateToRootUrl();
 
       cy.submitQuoteAnswersHappyPathSinglePolicy({});
       cy.assertUrl(url);
@@ -149,7 +149,7 @@ context('Change your answers - as an exporter, I want to change the details befo
   context('change `Policy type` and `Policy length` two times (single, multiple, then single 5 months)', () => {
     context('Policy type and length fields - user flow', () => {
       before(() => {
-        cy.login();
+        cy.navigateToRootUrl();
 
         cy.submitQuoteAnswersHappyPathSinglePolicy({});
         cy.assertUrl(url);
@@ -201,7 +201,7 @@ context('Change your answers - as an exporter, I want to change the details befo
 
     context('Policy type and length fields - check new answers', () => {
       beforeEach(() => {
-        cy.login();
+        cy.navigateToRootUrl();
 
         cy.submitQuoteAnswersHappyPathSinglePolicy({});
         cy.assertUrl(url);
@@ -237,7 +237,7 @@ context('Change your answers - as an exporter, I want to change the details befo
   context('change `Policy type` and `Policy length` three times (single, multiple, single, then multiple)', () => {
     context('Policy type and length fields - user flow', () => {
       before(() => {
-        cy.login();
+        cy.navigateToRootUrl();
 
         cy.submitQuoteAnswersHappyPathSinglePolicy({});
         cy.assertUrl(url);

e2e-tests/quote/cypress/e2e/journeys/quote/change-your-answers/change-your-answers-policy-type-and-length.spec.js

@@ -37,7 +37,7 @@ context('Check your answers page (multiple policy) - as an exporter, I want to r
   const url = `${baseUrl}${CHECK_YOUR_ANSWERS}`;
 
   before(() => {
-    cy.login();
+    cy.navigateToRootUrl();
     cy.submitQuoteAnswersHappyPathMultiplePolicy();
     cy.assertUrl(url);
   });

e2e-tests/quote/cypress/e2e/journeys/quote/check-your-answers/check-your-answers-multi-policy.spec.js

@@ -40,7 +40,7 @@ context('Check your answers page (single policy) - as an exporter, I want to rev
   const url = `${baseUrl}${CHECK_YOUR_ANSWERS}`;
 
   before(() => {
-    cy.login();
+    cy.navigateToRootUrl();
     cy.submitQuoteAnswersHappyPathSinglePolicy({});
     cy.assertUrl(url);
   });

e2e-tests/quote/cypress/e2e/journeys/quote/check-your-answers/check-your-answers-single-policy.spec.js

@@ -16,7 +16,7 @@ context('Contact us page - Quote', () => {
   const url = ROUTES.CONTACT_US;
 
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     // click on contact link in footer
     footer.supportLinks.contact().click();

e2e-tests/quote/cypress/e2e/journeys/quote/contact-us.spec.js

@@ -20,7 +20,7 @@ context('Cookies saved page - Quote', () => {
   const buyerCountryUrl = `${baseUrl}${BUYER_COUNTRY}`;
 
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     partials.footer.supportLinks.cookies().click();
 

e2e-tests/quote/cypress/e2e/journeys/quote/cookies-saved.spec.js

@@ -26,7 +26,7 @@ context('Cookies page - Quote', () => {
   const buyerCountryUrl = `${baseUrl}${BUYER_COUNTRY}`;
 
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
 
     partials.footer.supportLinks.cookies().click();
 

e2e-tests/quote/cypress/e2e/journeys/quote/cookies.spec.js

@@ -16,7 +16,7 @@ context(
     const url = `${baseUrl}${EXPORTER_LOCATION}`;
 
     before(() => {
-      cy.login();
+      cy.navigateToRootUrl();
       cy.completeAndSubmitBuyerCountryForm({});
       cy.completeAndSubmitBuyerBodyForm();
 

e2e-tests/quote/cypress/e2e/journeys/quote/exporter-location/exporter-location-answer-no.spec.js

@@ -19,7 +19,7 @@ context('Exporter location page - as an exporter, I want to check if my company
   const url = `${baseUrl}${EXPORTER_LOCATION}`;
 
   beforeEach(() => {
-    cy.login();
+    cy.navigateToRootUrl();
     cy.completeAndSubmitBuyerCountryForm({});
     cy.completeAndSubmitBuyerBodyForm();