@zohodesk/testinglibrary 0.4.56-experimental → 0.4.57-n18-experimental

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

@@ -24,11 +24,7 @@ function getAuthFileDirectory() {
   return _path.default.resolve(_path.default.join(uatDirectory, 'playwright', '.auth'));
 }
 function verifyIfCookieFileExists(authFile) {
-  (0, _checkAuthDirectory.createAuthDirectoryIfNotExist)();
-  if (!(0, _fs.existsSync)(authFile)) {
-    console.log('creating auth file..');
-    (0, _fs.writeFileSync)(authFile, JSON.stringify(authContent, null, 2));
-  }
+  return (0, _fs.existsSync)(authFile);
 }
 function convertCookiesToParse(cookies, authFilePath) {
   try {
@@ -39,8 +35,11 @@ function convertCookiesToParse(cookies, authFilePath) {
   }
 }
 async function loadCookiesIfPresent(page, authFile) {
-  verifyIfCookieFileExists(authFile);
-  const cookies = (0, _fs.readFileSync)(authFile);
-  const parsedCookies = convertCookiesToParse(cookies, authFile);
-  await page.context().addCookies(parsedCookies.cookies === undefined ? [] : parsedCookies.cookies);
+  if (verifyIfCookieFileExists(authFile)) {
+    const fileContent = (0, _fs.readFileSync)(authFile);
+    const stroageState = convertCookiesToParse(fileContent, authFile);
+    if (stroageState.cookies) {
+      await page.context().addCookies(stroageState.cookies);
+    }
+  }
 }

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

@@ -10,6 +10,7 @@ var _fileMutex = _interopRequireDefault(require("../fileMutex"));
 var _fileMutexConfig = require("../../constants/fileMutexConfig");
 var _checkAuthCookies = require("./checkAuthCookies");
 var _checkAuthDirectory = require("../checkAuthDirectory");
+var _fs = require("fs");
 /* eslint-disable no-console */
 
 async function performLoginSteps(testInfo, isLoggedIn, loginSteps) {
@@ -20,23 +21,34 @@ async function performLoginSteps(testInfo, isLoggedIn, loginSteps) {
   } = testInfo;
   authFilePrefix = authFilePrefix || email;
   const authFile = _path.default.resolve(_path.default.join((0, _checkAuthCookies.getAuthFileDirectory)(), `${authFilePrefix}-cookies.json`));
+  const tempStoragePath = _path.default.resolve(_path.default.join((0, _checkAuthCookies.getAuthFileDirectory)(), `${authFilePrefix}-${Date.now()}-cookies.json`));
   const lockFileName = email.replace(/[@.]/g, '_');
-  const fileMutex = new _fileMutex.default((0, _checkAuthDirectory.getLockDirectoryPath)(), lockFileName, email, authFile, _fileMutexConfig.fileDeletionTimeoutConfig);
+  const fileMutex = new _fileMutex.default((0, _checkAuthDirectory.getLockDirectoryPath)(), lockFileName, _fileMutexConfig.fileDeletionTimeoutConfig);
+  let loginUsingCookie = false;
   try {
-    await fileMutex.acquire();
+    if ((0, _checkAuthCookies.verifyIfCookieFileExists)(authFile)) {
+      console.log(`${email} Cookie file exists. Loading cookies, worker index - ${process.env.TEST_WORKER_INDEX}`);
+      loginUsingCookie = true;
+    } else {
+      await fileMutex.acquire();
+    }
     await (0, _checkAuthCookies.loadCookiesIfPresent)(page, authFile);
     const isAlreadyLoggedIn = await isLoggedIn(testInfo);
     if (!isAlreadyLoggedIn) {
       await loginSteps(testInfo);
       await isLoggedIn(testInfo);
+      const isFileExists = (0, _fs.existsSync)(authFile);
+      const storageFilePath = isFileExists ? tempStoragePath : authFile;
       await page.context().storageState({
-        path: authFile
+        path: storageFilePath
       });
     }
   } catch (error) {
     console.error(`Error during login for ${email}:`, error);
   } finally {
-    await fileMutex.release();
+    if (!loginUsingCookie) {
+      await fileMutex.release();
+    }
   }
 }
 var _default = exports.default = performLoginSteps;

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

@@ -12,25 +12,19 @@ function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("C
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); }
 var _FileMutex_brand = /*#__PURE__*/new WeakSet();
 class FileMutex {
-  constructor(directory, lockFileName, email, authFile, fileDeletionTimeoutConfig) {
+  constructor(directory, lockFileName, fileDeletionTimeoutConfig) {
     _classPrivateMethodInitSpec(this, _FileMutex_brand);
     this.directory = directory;
     this.lockFileName = lockFileName + ".lock";
-    this.email = email;
-    this.authFile = authFile;
     this.fileDeletionTimeout = fileDeletionTimeoutConfig.timeout;
-    this.createDirectoryIfNotExist();
     this.lockFilePath = _assertClassBrand(_FileMutex_brand, this, _getLockFilePath).call(this);
+    _assertClassBrand(_FileMutex_brand, this, _createDirectoryIfNotExist).call(this);
   }
   async acquire() {
-    if ((0, _fs.existsSync)(this.authFile)) {
-      console.log(`${this.email} Cookie file exists. Loading cookies...`);
-      return;
-    }
     return new Promise((resolve, reject) => {
       if (!(0, _fs.existsSync)(this.lockFilePath)) {
         (0, _fs.writeFileSync)(this.lockFilePath, 'locked');
-        console.log(`Lock file created: ${this.lockFilePath}`);
+        console.log(`Lock file created: ${this.lockFilePath}, worker index - ${process.env.TEST_WORKER_INDEX}`);
         return resolve();
       }
       const timeout = setTimeout(() => {
@@ -41,7 +35,7 @@ class FileMutex {
         try {
           if (eventType === 'rename' && filename === this.lockFileName) {
             clearTimeout(timeout);
-            console.log(`Lock file deleted! Proceeding...`);
+            console.log(`Lock file deleted! Proceeding, worker index - ${process.env.TEST_WORKER_INDEX}`);
             watcher.close();
             resolve();
           }
@@ -56,21 +50,21 @@ class FileMutex {
     try {
       if ((0, _fs.existsSync)(this.lockFilePath)) {
         (0, _fs.unlinkSync)(this.lockFilePath);
-        console.log(`Lock file deleted: ${this.lockFilePath}`);
+        console.log(`Lock file deleted: ${this.lockFilePath}, worker index - ${process.env.TEST_WORKER_INDEX}`);
       }
     } catch (err) {
-      console.error(`Error deleting lock file: ${err.message}`);
-    }
-  }
-  async createDirectoryIfNotExist() {
-    if (!(0, _fs.existsSync)(this.directory)) {
-      (0, _fs.mkdirSync)(this.directory, {
-        recursive: true
-      });
+      console.error(`Error deleting lock file: ${err.message}, worker index - ${process.env.TEST_WORKER_INDEX}`);
     }
   }
 }
 function _getLockFilePath() {
   return _path.default.resolve(_path.default.join(this.directory, this.lockFileName));
 }
+async function _createDirectoryIfNotExist() {
+  if (!(0, _fs.existsSync)(this.directory)) {
+    (0, _fs.mkdirSync)(this.directory, {
+      recursive: true
+    });
+  }
+}
 var _default = exports.default = FileMutex;

package/build/test/core/playwright/buildInFixtures/__tests__/executionContext.test.js

@@ -0,0 +1,27 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _page = require("../../../../../core/playwright/builtInFixtures/page");
+var _executionContext = _interopRequireDefault(require("../../../../../core/playwright/builtInFixtures/executionContext"));
+jest.mock('../../../../../core/playwright/builtInFixtures/page');
+describe('executionContext', () => {
+  test('should pass actorInfo with details from getCustomAccountDetails to use', async () => {
+    const mockTags = ['tag1', 'tag2'];
+    const mockActorInfo = {
+      id: '1',
+      edition: 'enterprise',
+      orgName: 'orgName',
+      profile: 'admin',
+      email: 'xxx.x+uat@zohotest.com'
+    };
+    _page.getCustomAccountDetails.mockReturnValue(mockActorInfo);
+    const use = jest.fn();
+    await _executionContext.default.executionContext({
+      $tags: mockTags
+    }, use);
+    expect(_page.getCustomAccountDetails).toHaveBeenCalledWith(mockTags);
+    expect(use).toHaveBeenCalledWith({
+      actorInfo: mockActorInfo
+    });
+  });
+});