@zohodesk/testinglibrary 0.4.85-n18-experimental → 0.4.86-n18-experimental

package/build/common/multi-actor/steps/additionalContext.spec.js

@@ -6,26 +6,19 @@ const {
   Given
 } = (0, _testinglibrary.createBdd)();
 BeforeScenario(async function ({
-  actorCtx,
-  page,
-  context,
-  browser,
-  executionContext
+  actorCtx
 }) {
   // This will run before each scenario and set all the fixtures into this context
-  this.page = page;
-  this.context = context;
-  this.browser = browser;
-  this.executionContext = executionContext;
   this.setActor = async role => {
-    const userPage = actorCtx.userPages.find(up => up.role === role);
+    const userPage = actorCtx.actorsObj[role];
     if (userPage) {
       this.page = userPage.page;
       this.context = userPage.context;
       this.browser = userPage.browser;
       this.executionContext = userPage.actorInfo;
     } else {
-      throw new Error(`Actor ${role} not found`);
+      const availableRoles = Object.keys(actorCtx.actorsObj);
+      throw new Error(`Actor "${role}" not found in user pages. Available roles: [${availableRoles.join(', ')}]`);
     }
   };
 });

package/build/core/playwright/builtInFixtures/actorCtx.js

@@ -6,70 +6,44 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _logger = require("../../../utils/logger");
 var _customFixturesHelper = require("../helpers/customFixturesHelper");
-class actorContext {
+var _loginDefaultStepsHelper = require("../helpers/auth/loginDefaultStepsHelper");
+class additionalActorContext {
   constructor() {
-    this.page = null;
-    this.browser = null;
-    this.context = null;
-    this.actorInfo = null;
-    this.userPages = [];
-    this.actorsList = {};
+    this.actorsObj = {};
   }
-  async setupAdditionalActors(browser, $tags, testInfo, defaultPage, defaultContext) {
-    const actorInfoMap = (0, _customFixturesHelper.getCustomAccountDetails)($tags);
-    const currentActor = actorInfoMap.additional;
-    await Promise.all(Object.entries(currentActor).map(async ([role, actorInfo], index) => {
-      let context, page;
-      if (index === 0) {
-        context = defaultContext;
-        page = defaultPage;
-      } else {
-        context = await browser.newContext();
-        page = await context.newPage();
-      }
-      let ctxTestDetails = {
-        page,
-        $tags,
-        context,
-        ...actorInfo
-      };
-      await (0, _customFixturesHelper.executeDefaultLoginSteps)(context, testInfo, ctxTestDetails, actorInfo);
-      this.actorsList[role] = {
-        role,
-        browser,
-        context,
-        page,
-        actorInfo,
-        isPrimary: index === 0
-      };
-      await this.addUserPage(role, browser, page, context, actorInfo);
-    }));
-    for (const actorObj of Object.values(this.actorsList)) {
-      await (0, _customFixturesHelper.performDefaultPageSteps)({
-        context: actorObj.context,
-        page: actorObj.page,
-        $tags,
-        ...actorObj.actorInfo
-      });
+  async setupAdditionalActors(browser, $tags, testInfo) {
+    try {
+      const actorInfoMap = (0, _customFixturesHelper.getCustomAccountDetails)($tags);
+      const additionalActors = actorInfoMap.additional;
+      await Promise.all(Object.entries(additionalActors).map(async ([role, actorInfo]) => {
+        let context = await browser.newContext();
+        let page = await context.newPage();
+        let ctxTestDetails = {
+          page,
+          $tags,
+          context,
+          ...actorInfo
+        };
+        await (0, _loginDefaultStepsHelper.executeDefaultLoginSteps)(context, testInfo, ctxTestDetails, actorInfo);
+        this.actorsObj[role] = {
+          role,
+          browser,
+          context,
+          page,
+          actorInfo
+        };
+      }));
+    } catch (error) {
+      _logger.Logger.log(_logger.Logger.FAILURE_TYPE, `Failed to setup additional actors:`, error);
+      throw error;
     }
   }
-  async addUserPage(role, browser, page, context, actorInfo) {
-    this.userPages.push({
-      role,
-      browser,
-      page,
-      context,
-      actorInfo
-    });
-  }
   async cleanup() {
-    for (const actor of Object.values(this.actorsList)) {
-      if (!actor.isPrimary && actor.context) {
-        try {
-          await actor.context.close();
-        } catch (error) {
-          _logger.Logger.log(_logger.Logger.FAILURE_TYPE, `Failed to close context for actor ${actor.role}:`, error);
-        }
+    for (const actor of Object.values(this.actorsObj)) {
+      try {
+        await actor.context.close();
+      } catch (error) {
+        _logger.Logger.log(_logger.Logger.FAILURE_TYPE, `Failed to close context for actor ${actor.role}:`, error);
       }
     }
   }
@@ -77,12 +51,10 @@ class actorContext {
 var _default = exports.default = {
   actorCtx: async ({
     $tags,
-    browser,
-    context,
-    page
+    browser
   }, use, testInfo) => {
-    const ctxObject = new actorContext();
-    await ctxObject.setupAdditionalActors(browser, $tags, testInfo, page, context);
+    const ctxObject = new additionalActorContext();
+    await ctxObject.setupAdditionalActors(browser, $tags, testInfo);
     await use(ctxObject);
     await ctxObject.cleanup();
   }

package/build/core/playwright/builtInFixtures/page.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _customFixturesHelper = require("../helpers/customFixturesHelper");
+var _loginDefaultStepsHelper = require("../helpers/auth/loginDefaultStepsHelper");
 /* eslint-disable global-require */
 var _default = exports.default = {
   page: async ({
@@ -26,11 +26,11 @@ var _default = exports.default = {
         await context.clearCookies();
         return;
       }
-      await (0, _customFixturesHelper.executeDefaultLoginSteps)(context, testInfo, testDetails, testPortalDetails);
+      await (0, _loginDefaultStepsHelper.executeDefaultLoginSteps)(context, testInfo, testDetails, testPortalDetails);
     } catch (e) {
       console.error('Error during page', e);
     } finally {
-      await (0, _customFixturesHelper.performDefaultPageSteps)(testDetails);
+      await (0, _loginDefaultStepsHelper.performDefaultPageSteps)(testDetails);
       await use(page);
       await context.close();
     }

package/build/core/playwright/helpers/auth/loginDefaultStepsHelper.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.executeDefaultLoginSteps = executeDefaultLoginSteps;
+exports.loginSteps = loginSteps;
+exports.performDefaultPageSteps = performDefaultPageSteps;
+exports.verifyPageIsLoaded = verifyPageIsLoaded;
+var _auth = require("../auth");
+var _readConfigFile = require("../../readConfigFile");
+let {
+  testSetup,
+  isAuthMode
+} = (0, _readConfigFile.generateConfigFromFile)();
+async function loginSteps(pageDetail) {
+  const {
+    page
+  } = pageDetail;
+  if (testSetup.loginSteps && typeof testSetup.loginSteps === 'function') {
+    return await testSetup.loginSteps(pageDetail);
+  } else {
+    await page.goto(process.env.domain);
+  }
+}
+async function performDefaultPageSteps(testInfo) {
+  if (testSetup.page && typeof testSetup.page === 'function') {
+    await testSetup.page(testInfo);
+  }
+}
+async function verifyPageIsLoaded(testInfo) {
+  if (testSetup.validateLogin && typeof testSetup.validateLogin === 'function') {
+    return await testSetup.validateLogin(testInfo);
+  }
+  return true;
+}
+async function executeDefaultLoginSteps(context, testInfo, testDetails, testPortalDetails) {
+  if (!isAuthMode) {
+    return;
+  }
+  try {
+    const projectName = testInfo.project.name;
+    if (testPortalDetails && projectName !== 'setup' && projectName !== 'cleanup') {
+      await context.clearCookies();
+      await (0, _auth.performLoginSteps)(testDetails, async testInfo => {
+        return await verifyPageIsLoaded(testInfo);
+      }, loginSteps);
+      process.env.actorInfo = JSON.stringify(testPortalDetails);
+    }
+  } catch (error) {
+    Logger.log(Logger.FAILURE_TYPE, 'Error while executing the default login steps:', error);
+  }
+}

package/build/core/playwright/helpers/customFixturesHelper.js

@@ -3,21 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.executeDefaultLoginSteps = executeDefaultLoginSteps;
 exports.getCustomAccountDetails = getCustomAccountDetails;
-exports.loginSteps = loginSteps;
-exports.performDefaultPageSteps = performDefaultPageSteps;
-exports.verifyPageIsLoaded = verifyPageIsLoaded;
 var _auth = require("../helpers/auth");
 var _additionalProfiles = require("../helpers/additionalProfiles");
-var _readConfigFile = require("../readConfigFile");
 var _logger = require("../../../utils/logger");
 /* eslint-disable global-require */
 
-let {
-  testSetup,
-  isAuthMode
-} = (0, _readConfigFile.generateConfigFromFile)();
 function getTagInputFromSelectedTags(tags, inputString) {
   const selectedTag = [...tags].reverse().find(tag => tag.startsWith(inputString));
   let tagInput = null;
@@ -49,42 +40,4 @@ function getCustomAccountDetails(tags) {
   } catch (err) {
     _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'Error while getting custom account details:', err);
   }
-}
-async function loginSteps(pageDetail) {
-  const {
-    page
-  } = pageDetail;
-  if (testSetup.loginSteps && typeof testSetup.loginSteps === 'function') {
-    return await testSetup.loginSteps(pageDetail);
-  } else {
-    await page.goto(process.env.domain);
-  }
-}
-async function performDefaultPageSteps(testInfo) {
-  if (testSetup.page && typeof testSetup.page === 'function') {
-    await testSetup.page(testInfo);
-  }
-}
-async function verifyPageIsLoaded(testInfo) {
-  if (testSetup.validateLogin && typeof testSetup.validateLogin === 'function') {
-    return await testSetup.validateLogin(testInfo);
-  }
-  return true;
-}
-async function executeDefaultLoginSteps(context, testInfo, testDetails, testPortalDetails) {
-  if (!isAuthMode) {
-    return;
-  }
-  try {
-    const projectName = testInfo.project.name;
-    if (testPortalDetails && projectName !== 'setup' && projectName !== 'cleanup') {
-      await context.clearCookies();
-      await (0, _auth.performLoginSteps)(testDetails, async testInfo => {
-        return await verifyPageIsLoaded(testInfo);
-      }, loginSteps);
-      process.env.actorInfo = JSON.stringify(testPortalDetails);
-    }
-  } catch (error) {
-    _logger.Logger.log(_logger.Logger.FAILURE_TYPE, 'Error while executing the default login steps:', error);
-  }
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.4.85-n18-experimental",
+  "version": "0.4.86-n18-experimental",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@zohodesk/testinglibrary",
-      "version": "0.4.85-n18-experimental",
+      "version": "0.4.86-n18-experimental",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.4.85-n18-experimental",
+  "version": "0.4.86-n18-experimental",
   "description": "",
   "main": "./build/index.js",
   "scripts": {