@zohodesk/testinglibrary 3.0.8 → 3.0.9

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

@@ -27,7 +27,7 @@ function getCustomAccountDetails(tags) {
     const user = (0, _auth.getUserForSelectedEditionAndProfile)(editionInfo, profileInfo, betaFeature, portalInfo);
     return user;
   }
-  return null;
+  return (0, _auth.getDefaultActor)();
 }
 const {
   testSetup
@@ -42,19 +42,9 @@ async function loginSteps(pageDetail) {
     await page.goto(process.env.domain);
   }
 }
-async function performDefaultPageSteps({
-  context,
-  $tags,
-  page
-}) {
+async function performDefaultPageSteps(testInfo) {
   if (testSetup.page && typeof testSetup.page === 'function') {
-    await testSetup.page({
-      context,
-      $tags,
-      page
-    });
-  } else {
-    await page.goto(process.env.domain);
+    await testSetup.page(testInfo);
   }
 }
 async function verifyPageIsLoaded(testInfo) {
@@ -68,7 +58,14 @@ var _default = exports.default = {
     context,
     $tags,
     page
-  }, use) => {
+  }, use, testInfo) => {
+    let testPortalDetails = getCustomAccountDetails($tags);
+    let testDetails = {
+      page,
+      $tags,
+      context,
+      ...testPortalDetails
+    };
     try {
       //This block is used to skip the login process if the @unauthenticated tag is added to the script
       if ($tags.includes('@unauthenticated')) {
@@ -81,30 +78,17 @@ var _default = exports.default = {
       if (!isAuthMode) {
         return;
       }
-      const testPortalDetails = getCustomAccountDetails($tags);
-      if (testPortalDetails) {
+      if (testPortalDetails && testInfo.project.name !== 'setup') {
         await context.clearCookies();
-        const {
-          email
-        } = testPortalDetails;
-        await (0, _auth.performLoginSteps)({
-          page,
-          $tags,
-          context,
-          ...testPortalDetails
-        }, async testInfo => {
+        await (0, _auth.performLoginSteps)(testDetails, async testInfo => {
           return await verifyPageIsLoaded(testInfo);
         }, loginSteps);
         process.env.actorInfo = JSON.stringify(testPortalDetails);
       }
-    } catch (error) {
-      console.error('Error during page', error);
+    } catch (e) {
+      console.error('Error during page', e);
     } finally {
-      await performDefaultPageSteps({
-        context,
-        $tags,
-        page
-      });
+      await performDefaultPageSteps(testDetails);
       await use(page);
       await context.close();
     }

package/build/core/playwright/clear-caches.js

@@ -9,6 +9,7 @@ var _path = _interopRequireDefault(require("path"));
 var _fileUtils = require("../../utils/fileUtils");
 var _logger = require("../../utils/logger");
 var _readConfigFile = require("./readConfigFile");
+var _checkAuthDirectory = require("./helpers/checkAuthDirectory");
 function deleteAuthFiles(authFilePath) {
   authFilePath = _path.default.resolve(process.cwd(), authFilePath);
   const authFileFolder = _path.default.dirname(authFilePath);
@@ -24,6 +25,11 @@ function deleteGeneratedFeatures() {
   _logger.Logger.log(_logger.Logger.INFO_TYPE, `Deleting generated features at ${featuresGenPath}`);
   (0, _fileUtils.deleteFolder)(featuresGenPath);
 }
+function deleteLockFiles() {
+  const lockFilePath = (0, _checkAuthDirectory.getLockDirectoryPath)();
+  _logger.Logger.log(_logger.Logger.INFO_TYPE, `Deleting lock files at ${lockFilePath}`);
+  (0, _fileUtils.deleteFolder)(lockFilePath);
+}
 function clearCaches() {
   try {
     const {
@@ -33,6 +39,7 @@ function clearCaches() {
     deleteAuthFiles(authFilePath);
     deletePlaywrightReport(reportPath);
     deleteGeneratedFeatures();
+    deleteLockFiles();
     _logger.Logger.log(_logger.Logger.SUCCESS_TYPE, 'Caches Cleared. Now you can try running npm run uat');
   } catch (err) {
     _logger.Logger.error(err);

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

@@ -25,12 +25,9 @@ async function performLoginSteps(testInfo, isLoggedIn, loginSteps) {
   try {
     await fileMutex.acquire();
     await (0, _checkAuthCookies.loadCookiesIfPresent)(page, authFile);
-    await page.goto(process.env.domain);
-    await Promise.race([page.waitForNavigation(), page.waitForLoadState('networkidle'), page.waitForTimeout(5000)]);
     const isAlreadyLoggedIn = await isLoggedIn(testInfo);
     if (!isAlreadyLoggedIn) {
       await loginSteps(testInfo);
-      await page.goto(process.env.domain);
       await isLoggedIn(testInfo);
       await page.context().storageState({
         path: authFile

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

@@ -16,7 +16,7 @@ function getUATFileName(mode) {
   if (_fs.default.existsSync(uatConfFilePath)) {
     return uatConfFilePath;
   }
-  return _path.default.resolve(process.cwd(), `uat.config.js`);
+  return _path.default.resolve(process.cwd(), `uat/conf/default/uat.config.js`);
 }
 function getEnvConfigFilePath(mode) {
   const confFilePath = _path.default.resolve(process.cwd(), `uat/conf/${mode}/settings.json`);

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

@@ -49,7 +49,9 @@ const use = {
 let reporter = [['html', {
   outputFolder: reportPath,
   open: openReportOn
-}], ['list'], ['./custom-reporter.js']];
+}], ['list'], ['json', {
+  outputFile: _path.default.join(process.cwd(), 'uat', 'test-results', 'test-results.json')
+}], ['./custom-reporter.js']];
 if (customReporter) {
   reporter = [customReporter, ...reporter];
 }

package/build/index.js

@@ -70,6 +70,12 @@ Object.defineProperty(exports, "performLoginSteps", {
     return _index.performLoginSteps;
   }
 });
+Object.defineProperty(exports, "setup", {
+  enumerable: true,
+  get: function () {
+    return _index.setup;
+  }
+});
 Object.defineProperty(exports, "test", {
   enumerable: true,
   get: function () {

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

@@ -24,7 +24,7 @@ describe('getUATFileName', () => {
   });
   test('return the default config files for pipeline matched files not exists', () => {
     const mode = 'ci';
-    const defaultPath = `${mockCwd}/uat.config.js`;
+    const defaultPath = `${mockCwd}/uat/conf/default/uat.config.js`;
     _fs.existsSync.mockReturnValue(false);
     _path.default.resolve.mockImplementation((...args) => args.join('/'));
     const result = (0, _configFileNameProvider.getUATFileName)(mode);