@zohodesk/testinglibrary 0.5.7-n18-experimental → 0.5.9-n18-experimental

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

@@ -26,8 +26,7 @@ var _default = exports.default = {
         await context.clearCookies();
         return;
       }
-
-      // await executeDefaultLoginSteps(context, testInfo , testDetails, testPortalDetails);
+      await (0, _loginDefaultStepsHelper.executeDefaultLoginSteps)(context, testInfo, testDetails, testPortalDetails);
     } catch (e) {
       console.error('Error during page', e);
     } finally {

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

@@ -41,6 +41,8 @@ async function executeDefaultLoginSteps(context, testInfo, testDetails, testPort
   }
   try {
     const projectName = testInfo.project.name;
+    const authFileName = process.env.authFileName;
+    testDetails.authFilePrefix = authFileName;
     if (testPortalDetails && projectName !== 'setup' && projectName !== 'cleanup') {
       await context.clearCookies();
       await (0, _auth.performLoginSteps)(testDetails, async testInfo => {

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

@@ -18,16 +18,21 @@ async function performLoginSteps(testInfo, isLoggedIn, loginSteps) {
     authFilePrefix,
     email
   } = testInfo;
-  authFilePrefix = authFilePrefix ? authFilePrefix + email : email;
-  console.log("authFilePrefix", authFilePrefix);
-  process.env.authFilePrefix = authFilePrefix;
-  const authFile = _path.default.resolve(_path.default.join((0, _checkAuthCookies.getAuthFileDirectory)(), `${authFilePrefix}-cookies.json`));
-  const lockFileName = authFilePrefix.replace(/[@.]/g, '_');
+  if (!authFilePrefix) {
+    authFileName = email;
+  } else if (authFilePrefix.includes(email)) {
+    authFileName = authFilePrefix;
+  } else {
+    authFileName = authFilePrefix + email;
+  }
+  process.env.authFileName = authFileName;
+  const authFile = _path.default.resolve(_path.default.join((0, _checkAuthCookies.getAuthFileDirectory)(), `${authFileName}-cookies.json`));
+  const lockFileName = authFileName.replace(/[@.]/g, '_');
   const fileMutex = new _fileMutex.default((0, _checkAuthDirectory.getLockDirectoryPath)(), lockFileName, _fileMutexConfig.fileDeletionTimeoutConfig);
   let loginUsingCookie = false;
   try {
     if ((0, _checkAuthCookies.verifyIfCookieFileExists)(authFile)) {
-      console.log(`${authFilePrefix} Cookie file exists. Loading cookies, worker index - ${process.env.TEST_WORKER_INDEX}`);
+      console.log(`${authFileName} Cookie file exists. Loading cookies, worker index - ${process.env.TEST_WORKER_INDEX}`);
       loginUsingCookie = true;
     } else {
       await fileMutex.acquire();
@@ -42,7 +47,7 @@ async function performLoginSteps(testInfo, isLoggedIn, loginSteps) {
       });
     }
   } catch (error) {
-    console.error(`Error during login for ${authFilePrefix}:`, error);
+    console.error(`Error during login for ${authFileName}:`, error);
   } finally {
     if (!loginUsingCookie) {
       await fileMutex.release();

package/build/core/playwright/readConfigFile.js

@@ -18,8 +18,8 @@ var _UserArgs = _interopRequireDefault(require("./configuration/UserArgs"));
 var _ConfigurationHelper = require("./configuration/ConfigurationHelper");
 let cachedConfig = null;
 function getPrimaryCookiePath() {
-  const authFilePrefix = process.env.authFilePrefix;
-  return `uat/playwright/.auth/${authFilePrefix}-cookies.json`;
+  const authFileName = process.env.authFileName;
+  return `uat/playwright/.auth/${authFileName}-cookies.json`;
 }
 function getDefaultConfig() {
   return {

package/build/core/playwright/setup/config-utils.js

@@ -35,7 +35,6 @@ function getBrowserConfig({
     viewport,
     storageState: isAuthMode ? (0, _readConfigFile.getAuthFilePath)(_path.default.resolve(process.cwd(), authFilePath)) : {}
   };
-  console.log("authFilePath", authFilePath);
   // Determine dependencies based on the mode and smoke test status
   let dependencies = isAuthMode ? ['setup'] : [];
   dependencies = isSmokeTest ? [...dependencies, 'smokeTest'] : dependencies;

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.5.7-n18-experimental",
+  "version": "0.5.9-n18-experimental",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@zohodesk/testinglibrary",
-      "version": "0.5.7-n18-experimental",
+      "version": "0.5.9-n18-experimental",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
@@ -18,7 +18,6 @@
         "@testing-library/jest-dom": "5.11.9",
         "@testing-library/react": "11.2.7",
         "@testing-library/react-hooks": "7.0.2",
-        "@zohodesk/testinglibrary": "file:zohodesk-testinglibrary-0.5.4-n18-experimental.tgz",
         "babel-jest": "29.6.2",
         "babel-plugin-transform-dynamic-import": "2.1.0",
         "fast-glob": "3.3.1",
@@ -4236,40 +4235,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@zohodesk/testinglibrary": {
-      "version": "0.5.4-n18-experimental",
-      "resolved": "file:zohodesk-testinglibrary-0.5.4-n18-experimental.tgz",
-      "integrity": "sha512-Y1fW2IiqobcE15ZfYSOca8CZ+/9zxoWkqW+XlRQtwUEfETjMSkccn4fuvycAnje7yDib14Bh804gP1ufncWv5w==",
-      "hasInstallScript": true,
-      "license": "ISC",
-      "dependencies": {
-        "@babel/code-frame": "7.27.1",
-        "@babel/preset-react": "7.22.5",
-        "@cucumber/cucumber": "11.3.0",
-        "@playwright/test": "1.53.2",
-        "@reportportal/agent-js-playwright": "5.1.11",
-        "@testing-library/jest-dom": "5.11.9",
-        "@testing-library/react": "11.2.7",
-        "@testing-library/react-hooks": "7.0.2",
-        "babel-jest": "29.6.2",
-        "babel-plugin-transform-dynamic-import": "2.1.0",
-        "fast-glob": "3.3.1",
-        "jest": "29.6.2",
-        "jest-environment-jsdom": "29.6.2",
-        "msw": "1.2.3",
-        "playwright": "1.53.2",
-        "playwright-bdd": "8.3.1",
-        "supports-color": "8.1.1"
-      },
-      "bin": {
-        "ZDTestingFramework": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "eslint": "*",
-        "react": "*",
-        "react-dom": "*"
-      }
-    },
     "node_modules/@zxing/text-encoding": {
       "version": "0.9.0",
       "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.5.7-n18-experimental",
+  "version": "0.5.9-n18-experimental",
   "description": "",
   "main": "./build/index.js",
   "scripts": {
@@ -29,7 +29,6 @@
     "@testing-library/jest-dom": "5.11.9",
     "@testing-library/react": "11.2.7",
     "@testing-library/react-hooks": "7.0.2",
-    "@zohodesk/testinglibrary": "file:zohodesk-testinglibrary-0.5.4-n18-experimental.tgz",
     "babel-jest": "29.6.2",
     "babel-plugin-transform-dynamic-import": "2.1.0",
     "fast-glob": "3.3.1",