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

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

@@ -21,7 +21,6 @@ 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, _fileMutexConfig.fileDeletionTimeoutConfig);
   let loginUsingCookie = false;
@@ -34,14 +33,22 @@ async function performLoginSteps(testInfo, isLoggedIn, loginSteps) {
     }
     await (0, _checkAuthCookies.loadCookiesIfPresent)(page, authFile);
     const isAlreadyLoggedIn = await isLoggedIn(testInfo);
+    let storage = {};
     if (!isAlreadyLoggedIn) {
       await loginSteps(testInfo);
       await isLoggedIn(testInfo);
-      const isFileExists = (0, _fs.existsSync)(authFile);
-      const storageFilePath = isFileExists ? tempStoragePath : authFile;
       await page.context().storageState({
-        path: storageFilePath
+        path: authFile
       });
+      if ((0, _fs.existsSync)(authFile)) {
+        const fileContent = await (0, _fs.readFileSync)(authFile, 'utf-8');
+        storage = JSON.parse(fileContent);
+      }
+      const modifiedStorage = {
+        ...storage,
+        domain: page.url()
+      };
+      (0, _fs.writeFileSync)(authFile, JSON.stringify(modifiedStorage), null, 2);
     }
   } catch (error) {
     console.error(`Error during login for ${email}:`, error);

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

@@ -54,6 +54,7 @@ class FileMutex {
       }
     } catch (err) {
       console.error(`Error deleting lock file: ${err.message}, worker index - ${process.env.TEST_WORKER_INDEX}`);
+      throw err;
     }
   }
 }

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

@@ -8,8 +8,6 @@ jest.mock('fs');
 describe('FileMutex', () => {
   const directory = '/tmp/locks';
   const lockFileName = 'test-lock';
-  const email = 'test@example.com';
-  const authFile = '/tmp/authFile';
   const fileDeletionTimeoutConfig = {
     timeout: 1000
   };
@@ -17,27 +15,14 @@ describe('FileMutex', () => {
   let fileMutex;
   beforeEach(() => {
     jest.clearAllMocks();
-    fileMutex = new _fileMutex.default(directory, lockFileName, email, authFile, fileDeletionTimeoutConfig);
+    fileMutex = new _fileMutex.default(directory, lockFileName, fileDeletionTimeoutConfig);
   });
   describe('acquire', () => {
-    it('should create directory if it does not exist', async () => {
-      _fs.existsSync.mockReturnValue(false);
-      await fileMutex.createDirectoryIfNotExist();
-      expect(_fs.mkdirSync).toHaveBeenCalledWith(directory, {
-        recursive: true
-      });
-    });
     it('should create the lock file if it does not exist', async () => {
-      _fs.existsSync.mockImplementation(filePath => filePath === authFile ? false : false);
       _fs.writeFileSync.mockImplementation(() => {});
       await fileMutex.acquire();
       expect(_fs.writeFileSync).toHaveBeenCalledWith(fileMutex.lockFilePath, 'locked');
     });
-    it('should resolve immediately if auth file exists', async () => {
-      _fs.existsSync.mockImplementation(filePath => filePath === authFile);
-      await fileMutex.acquire();
-      expect(_fs.existsSync).toHaveBeenCalledWith(authFile);
-    });
     it('should wait for lock file deletion if it exists', async () => {
       _fs.existsSync.mockImplementation(filePath => filePath === fileMutex.lockFilePath);
       _fs.watch.mockImplementation((dir, callback) => {
@@ -88,9 +73,7 @@ describe('FileMutex', () => {
       _fs.unlinkSync.mockImplementation(() => {
         throw new Error(errorMessage);
       });
-      console.error = jest.fn();
-      await fileMutex.release();
-      expect(console.error).toHaveBeenCalledWith(`Error deleting lock file: ${errorMessage}`);
+      await expect(fileMutex.release()).rejects.toThrow(errorMessage);
     });
   });
 });

package/build/utils/fileUtils.js

@@ -61,7 +61,7 @@ function deleteFile(filePath) {
 function deleteFolder(folderPath) {
   if (_fs.default.existsSync(folderPath)) {
     try {
-      _fs.default.rmdirSync(folderPath, {
+      _fs.default.rmSync(folderPath, {
         recursive: true
       });
     } catch (err) {