test(e2e): fix overlapping e2e reports

jwplayer · Apr 11, 2024 · d8f0b21 · d8f0b21
1 parent 940d474
commit d8f0b21
Show file tree

Hide file tree

Showing 10 changed files with 157 additions and 150 deletions.
diff --git a/platforms/web/test-e2e/tests/account_test.ts b/platforms/web/test-e2e/tests/account_test.ts
@@ -14,15 +14,16 @@ const consentCheckbox = 'Yes, I want to receive Blender updates by email';
 const firstName = 'John Q.';
 const lastName = 'Tester';
 
+Feature(`account`).retry(Number(process.env.TEST_RETRY_COUNT) || 0);
+
 runTestSuite(testConfigs.jwpSvod, 'JW Player', 'direct', false);
 runTestSuite(testConfigs.svod, 'Cleeng', 'resetLink', true);
 
 function runTestSuite(config: typeof testConfigs.svod, providerName: string, resetPasswordType: string, canEditEmail: boolean) {
   let loginContext: LoginContext;
 
-  Feature(`account - ${providerName}`).retry(Number(process.env.TEST_RETRY_COUNT) || 0);
-
-  Before(async ({ I }) => {
+  async function beforeScenario(I: CodeceptJS.I) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     I.useConfig(config);
 
     loginContext = await I.registerOrLogin(loginContext, () => {
@@ -34,9 +35,11 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
 
       I.clickCloseButton();
     });
-  });
+  }
 
   Scenario(`I can see my account data - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
+
     I.seeInCurrentUrl(constants.baseUrl);
     await I.openMainMenu();
 
@@ -73,6 +76,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   Scenario(`I can cancel Edit account - ${providerName}`, async ({ I }) => {
     if (!canEditEmail) return;
 
+    await beforeScenario(I);
+
     editAndCancel(I, editAccount, [
       { name: emailField, startingValue: loginContext.email, newValue: '[email protected]' },
       { name: passwordField, startingValue: '', newValue: 'pass123!?' },
@@ -82,6 +87,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   Scenario(`I get a duplicate email warning - ${providerName}`, async ({ I }) => {
     if (!canEditEmail) return;
 
+    await beforeScenario(I);
+
     editAndCancel(I, editAccount, [
       {
         name: emailField,
@@ -100,6 +107,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   Scenario(`I get a wrong password warning - ${providerName}`, async ({ I }) => {
     if (!canEditEmail) return;
 
+    await beforeScenario(I);
+
     editAndCancel(I, editAccount, [
       {
         name: emailField,
@@ -118,6 +127,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   Scenario(`I can toggle to view/hide my password - ${providerName}`, async ({ I }) => {
     if (!canEditEmail) return;
 
+    await beforeScenario(I);
+
     I.amOnPage(constants.accountsUrl);
     I.click(editAccount);
     await passwordUtils.testPasswordToggling(I, 'confirmationPassword');
@@ -126,6 +137,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   Scenario(`I can reset my password (reset link) - ${providerName}`, async ({ I }) => {
     if (resetPasswordType !== 'resetlink') return;
 
+    await beforeScenario(I);
+
     I.amOnPage(constants.accountsUrl);
 
     I.click('Edit password');
@@ -154,6 +167,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   });
 
   Scenario(`I can update firstName - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
+
     editAndSave(I, editDetails, [
       {
         name: firstNameField,
@@ -177,6 +192,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   });
 
   Scenario(`I can update lastName - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
+
     editAndSave(I, editDetails, [
       {
         name: lastNameField,
@@ -200,6 +217,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   });
 
   Scenario(`I can update details - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
+
     editAndSave(I, editDetails, [
       {
         name: firstNameField,
@@ -235,6 +254,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   });
 
   Scenario(`I see name limit errors - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
+
     editAndCancel(I, editDetails, [
       {
         name: firstNameField,
@@ -252,6 +273,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   });
 
   Scenario(`I can update my consents - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
+
     I.amOnPage(constants.accountsUrl);
     I.waitForText('Account info', longTimeout);
     I.scrollTo('//*[text() = "Legal & Marketing"]', undefined, -100);
@@ -288,6 +311,8 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
   Scenario(`I can change email - ${providerName}`, async ({ I }) => {
     if (!canEditEmail) return;
 
+    await beforeScenario(I);
+
     const newEmail = passwordUtils.createRandomEmail();
 
     editAndSave(I, editAccount, [
@@ -305,7 +330,15 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
     ]);
   });
 
-  function editAndSave(I: CodeceptJS.I, editButton: string, fields: { name: string; newValue: string; expectedError?: string }[]) {
+  function editAndSave(
+    I: CodeceptJS.I,
+    editButton: string,
+    fields: {
+      name: string;
+      newValue: string;
+      expectedError?: string;
+    }[],
+  ) {
     I.amOnPage(constants.accountsUrl);
     I.waitForElement(`//*[text() = "${editButton}"]`, normalTimeout);
     I.scrollTo(`//*[text() = "${editButton}"]`);
@@ -354,7 +387,16 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string, res
     I.click('Cancel');
   }
 
-  function editAndCancel(I: CodeceptJS.I, editButton: string, fields: { name: string; startingValue: string; newValue: string; expectedError?: string }[]) {
+  function editAndCancel(
+    I: CodeceptJS.I,
+    editButton: string,
+    fields: {
+      name: string;
+      startingValue: string;
+      newValue: string;
+      expectedError?: string;
+    }[],
+  ) {
     I.amOnPage(constants.accountsUrl);
     I.click(editButton);
 

diff --git a/platforms/web/test-e2e/tests/language_test.ts b/platforms/web/test-e2e/tests/language_test.ts
@@ -65,7 +65,7 @@ Scenario('Spanish language is selected when the locale is `es-ES`', async ({ I }
   await assertActiveLanguage(I, 'es');
 });
 
-Scenario('Changing the language is persisted in the localStorage`', async ({ I }) => {
+Scenario('Changing the language is persisted in the localStorage', async ({ I }) => {
   I.restartBrowser({ locale: 'en-US' });
   I.useConfig(testConfigs.basicNoAuth);
 
@@ -80,7 +80,7 @@ Scenario('Changing the language is persisted in the localStorage`', async ({ I }
   assert.strictEqual(persistedLanguage, 'es');
 });
 
-Scenario('The language is restored from localStorage`', async ({ I }) => {
+Scenario('The language is restored from localStorage', async ({ I }) => {
   I.restartBrowser({
     storageState: {
       origins: [

diff --git a/platforms/web/test-e2e/tests/login/account_test.ts b/platforms/web/test-e2e/tests/login/account_test.ts
@@ -2,35 +2,39 @@ import { testConfigs } from '@jwp/ott-testing/constants';
 
 import constants, { normalTimeout } from '#utils/constants';
 import passwordUtils from '#utils/password_utils';
-import { tryToSubmitForm, fillAndCheckField, checkField } from '#utils/login';
+import { checkField, fillAndCheckField, tryToSubmitForm } from '#utils/login';
 
 const fieldRequired = 'This field is required';
 const invalidEmail = 'Please re-enter your email details and try again.';
 const incorrectLogin = 'Incorrect email/password combination';
-const formFeedback = 'div[class*=formFeedback]';
+
+Feature('login - account').retry(Number(process.env.TEST_RETRY_COUNT) || 0);
 
 runTestSuite(testConfigs.jwpAuth, 'JW Player');
 runTestSuite(testConfigs.cleengAuthvod, 'Cleeng');
 
 function runTestSuite(config: typeof testConfigs.svod, providerName: string) {
-  Feature(`login - account - ${providerName}`).retry(Number(process.env.TEST_RETRY_COUNT) || 0);
-
-  Before(async ({ I }) => {
+  async function beforeScenario(I: CodeceptJS.I) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     I.useConfig(config);
 
     await I.openSignInModal();
 
     I.waitForElement(constants.loginFormSelector, normalTimeout);
-  });
+  }
 
   Scenario(`I can close the modal - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
+
     I.clickCloseButton();
     I.dontSee('Email');
     I.dontSee('Password');
     I.dontSeeElement(constants.loginFormSelector);
   });
 
   Scenario(`I can close the modal by clicking outside - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
+
     I.forceClick('div[data-testid="backdrop"]');
 
     I.dontSee('Email');
@@ -39,17 +43,20 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string) {
   });
 
   Scenario(`I can toggle to view password - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
     await passwordUtils.testPasswordToggling(I);
   });
 
   Scenario(`I get a warning when the form is incompletely filled in - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
     tryToSubmitForm(I);
 
     checkField(I, 'email', fieldRequired);
     checkField(I, 'password', fieldRequired);
   });
 
   Scenario(`I see email warnings - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
     I.fillField('email', '[email protected]');
     I.fillField('password', 'Password');
 
@@ -81,6 +88,7 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string) {
   });
 
   Scenario(`I see empty password warnings - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
     I.fillField('email', '[email protected]');
     I.fillField('password', 'Password');
 
@@ -105,6 +113,7 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string) {
   });
 
   Scenario(`I see a login error message - ${providerName}`, async ({ I }) => {
+    await beforeScenario(I);
     I.fillField('email', '[email protected]');
     I.fillField('password', 'Password');
 

diff --git a/platforms/web/test-e2e/tests/login/home_test.ts b/platforms/web/test-e2e/tests/login/home_test.ts
@@ -3,26 +3,24 @@ import { testConfigs } from '@jwp/ott-testing/constants';
 import constants, { longTimeout } from '#utils/constants';
 import { LoginContext } from '#utils/password_utils';
 
+Feature(`login - home`).retry(Number(process.env.TEST_RETRY_COUNT) || 0);
+
 runTestSuite(testConfigs.jwpAuth, 'JW Player');
 runTestSuite(testConfigs.cleengAuthvod, 'Cleeng');
 
 function runTestSuite(config: typeof testConfigs.svod, providerName: string) {
   let loginContext: LoginContext;
 
-  Feature(`login - home - ${providerName}`).retry(Number(process.env.TEST_RETRY_COUNT) || 0);
-
-  Before(({ I }) => {
-    I.useConfig(config);
-  });
-
   Scenario(`Sign-in buttons show for accounts config - ${providerName}`, async ({ I }) => {
+    I.useConfig(config);
     await I.openSignInMenu();
 
     I.see('Sign in');
     I.see('Sign up');
   });
 
   Scenario(`Sign-in buttons don't show for config without accounts - ${providerName}`, async ({ I }) => {
+    I.useConfig(config);
     await I.openSignInMenu();
 
     I.see('Sign in');
@@ -37,6 +35,7 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string) {
   });
 
   Scenario(`I can open the log in modal - ${providerName}`, async ({ I }) => {
+    I.useConfig(config);
     await I.openSignInModal();
     I.waitForElement(constants.loginFormSelector, longTimeout);
 
@@ -51,6 +50,7 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string) {
   });
 
   Scenario(`I can login - ${providerName}`, async ({ I }) => {
+    I.useConfig(config);
     loginContext = await I.registerOrLogin(loginContext);
 
     await I.openMainMenu();
@@ -64,6 +64,7 @@ function runTestSuite(config: typeof testConfigs.svod, providerName: string) {
   });
 
   Scenario(`I can log out - ${providerName}`, async ({ I }) => {
+    I.useConfig(config);
     loginContext = await I.registerOrLogin(loginContext);
 
     await I.openMainMenu();

diff --git a/platforms/web/test-e2e/tests/payments/coupons_test.ts b/platforms/web/test-e2e/tests/payments/coupons_test.ts
@@ -2,7 +2,7 @@ import { testConfigs } from '@jwp/ott-testing/constants';
 
 import { LoginContext } from '#utils/password_utils';
 import constants from '#utils/constants';
-import { addYear, cancelPlan, checkSubscription, finishSubscription, formatPrice, goToCheckout, overrideIP, renewPlan } from '#utils/payments';
+import { goToCheckout, formatPrice, finishSubscription, addYear, cancelPlan, renewPlan, overrideIP, checkSubscription } from '#utils/payments';
 import { ProviderProps } from '#test/types';
 
 const jwProps: ProviderProps = {
@@ -31,26 +31,24 @@ const cleengProps: ProviderProps = {
   hasInlineOfferSwitch: false,
 };
 
+Feature('payments-coupon').retry(Number(process.env.TEST_RETRY_COUNT) || 0);
+
+Before(async ({ I }) => {
+  // This gets used in checkoutService.getOffer to make sure the offers are geolocated for NL
+  overrideIP(I);
+});
+
 runTestSuite(jwProps, 'JW Player');
 runTestSuite(cleengProps, 'Cleeng');
 
 function runTestSuite(props: ProviderProps, providerName: string) {
   let couponLoginContext: LoginContext;
-
   const today = new Date();
 
-  // This is written as a second test suite so that the login context is a different user.
-  // Otherwise, there's no way to re-enter payment info and add a coupon code
-  Feature(`payments-coupon - ${providerName}`).retry(Number(process.env.TEST_RETRY_COUNT) || 0);
-
-  Before(async ({ I }) => {
-    // This gets used in checkoutService.getOffer to make sure the offers are geolocated for NL
-    overrideIP(I);
+  Scenario(`I can redeem coupons - ${providerName}`, async ({ I }) => {
     I.useConfig(props.config);
     couponLoginContext = await I.registerOrLogin(couponLoginContext);
-  });
 
-  Scenario(`I can redeem coupons - ${providerName}`, async ({ I }) => {
     await goToCheckout(I);
 
     I.click('Redeem coupon');
@@ -87,15 +85,22 @@ function runTestSuite(props: ProviderProps, providerName: string) {
         '',
       );
     }
+
     await finishSubscription(I);
     await checkSubscription(I, addYear(today), today, props.yearlyOffer.price, props.hasInlineOfferSwitch);
   });
 
   Scenario(`I can cancel a free subscription - ${providerName}`, async ({ I }) => {
-    cancelPlan(I, addYear(today), props.canRenewSubscription, providerName);
+    I.useConfig(props.config);
+    couponLoginContext = await I.registerOrLogin(couponLoginContext);
+
+    await cancelPlan(I, addYear(today), props.canRenewSubscription, providerName);
   });
 
   Scenario(`I can renew a free subscription - ${providerName}`, async ({ I }) => {
+    I.useConfig(props.config);
+    couponLoginContext = await I.registerOrLogin(couponLoginContext);
+
     if (props.canRenewSubscription) {
       renewPlan(I, addYear(today), props.yearlyOffer.price);
     } else {