@zohodesk/testinglibrary 0.2.3 → 0.2.5

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

@@ -20,11 +20,19 @@ function replaceI18NValuesWithRegex(i18nStr, values) {
   }
   return i18nStr;
 }
+async function isI18NKeyDefined(key) {
+  return new Promise(resolve => {
+    if (typeof window.i18n[key] !== 'undefined') {
+      resolve();
+    }
+  });
+}
 var _default = exports.default = {
   i18N: async ({
     page
   }, use) => {
     await use(async (key, values) => {
+      await page.waitForFunction(isI18NKeyDefined(key));
       const i18nValue = await page.evaluate(i18nKey => window.i18n[i18nKey], key);
       const i18nStr = replaceI18NValuesWithRegex(i18nValue, values);
       return i18nStr;

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

@@ -1,10 +1,12 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _auth = require("../helpers/auth");
+var _getUrlOrigin = _interopRequireDefault(require("../helpers/auth/getUrlOrigin"));
 var _readConfigFile = require("../readConfigFile");
 /* eslint-disable global-require */
 
@@ -47,12 +49,27 @@ async function performDefaultPageSteps({
     await page.goto(process.env.domain);
   }
 }
+async function verifyPageIsLoaded(page) {
+  const urlOrigin = (0, _getUrlOrigin.default)(page.url());
+  const domainOrigin = (0, _getUrlOrigin.default)(process.env.domain);
+  if (urlOrigin === domainOrigin) {
+    return true;
+  }
+  return false;
+}
 var _default = exports.default = {
   page: async ({
     context,
     $tags,
     page
   }, use) => {
+    const {
+      isAuthMode
+    } = (0, _readConfigFile.generateConfigFromFile)();
+    if (!isAuthMode) {
+      await use(page);
+      return;
+    }
     const testPortalDetails = getCustomAccountDetails($tags);
     if (testPortalDetails === null) {
       await performDefaultPageSteps({
@@ -74,7 +91,9 @@ var _default = exports.default = {
         authFilePrefix: email,
         useremail: email,
         password: password
-      }, async () => page.url().includes(process.env.domain));
+      }, async () => {
+        return await verifyPageIsLoaded(page);
+      });
       process.env.actorInfo = JSON.stringify(testPortalDetails);
       await performDefaultPageSteps({
         context,

package/build/core/playwright/env-initializer.js

@@ -10,6 +10,7 @@ var _path = _interopRequireDefault(require("path"));
 var _configFileNameProvider = require("./helpers/configFileNameProvider");
 var _logger = require("../../utils/logger");
 var _getUsers = require("./helpers/auth/getUsers");
+var _readConfigFile = require("./readConfigFile");
 function setEnvironmentVariables(configJSON) {
   for (const key in configJSON) {
     process.env[key] = configJSON[key];
@@ -32,8 +33,13 @@ function initializeEnvConfig(mode) {
       ...configJSON,
       mode
     });
-    const defaultActorConfiguration = (0, _getUsers.getDefaultActorConf)();
-    setEnvironmentVariables(defaultActorConfiguration);
+    const {
+      isAuthMode
+    } = (0, _readConfigFile.generateConfigFromFile)();
+    if (isAuthMode) {
+      const defaultActorConfiguration = (0, _getUsers.getDefaultActorConf)();
+      setEnvironmentVariables(defaultActorConfiguration);
+    }
   } catch (err) {
     _logger.Logger.error(err);
     throw new Error(`Config File Not Exists. Please provide a config file ${(0, _configFileNameProvider.getEnvConfigFilePath)(mode)} to intiailize the environment variables `);

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

@@ -31,8 +31,12 @@ function isDevelopmentSetup() {
 }
 function getDefaultActorConf() {
   const {
-    uatDirectory
+    uatDirectory,
+    isAuthMode
   } = (0, _readConfigFile.generateConfigFromFile)();
+  if (!isAuthMode) {
+    return {};
+  }
   const defaultSettingFile = `conf/${getRunMode()}/settings.json`;
   const filePath = _path.default.join(uatDirectory, defaultSettingFile);
   if (!(0, _fs.existsSync)(filePath)) {
@@ -49,8 +53,15 @@ function getDefaultActor() {
 }
 function getListOfActors() {
   const {
-    uatDirectory
+    uatDirectory,
+    isAuthMode
   } = (0, _readConfigFile.generateConfigFromFile)();
+  if (!isAuthMode) {
+    return {
+      editions: [],
+      beta: []
+    };
+  }
   const mode = getRunMode();
   const configFile = `conf/${mode}/actors/index`;
   const filePath = _path.default.join(uatDirectory, configFile);
@@ -60,6 +71,12 @@ function getListOfActors() {
   return require(filePath);
 }
 function getUserForSelectedEditionAndProfile(preferedEdition, preferredProfile, betaFeature, testDataPortal = null) {
+  const {
+    isAuthMode
+  } = (0, _readConfigFile.generateConfigFromFile)();
+  if (!isAuthMode) {
+    return {};
+  }
   const {
     editions: userdata,
     beta: betaPortals

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

@@ -19,7 +19,12 @@ async function performLoginSteps({
   const authFile = _path.default.resolve(_path.default.join((0, _checkAuthCookies.getAuthFileDirectory)(), `${authFilePrefix}-cookies.json`));
   await (0, _checkAuthCookies.loadCookiesIfPresent)(page, authFile);
   await page.goto(process.env.domain);
-  await page.waitForNavigation();
+
+  // await page.waitForNavigation();
+
+  // await page.waitForLoadState('networkidle')
+
+  await Promise.race([page.waitForNavigation(), page.waitForLoadState('networkidle'), page.waitForTimeout(5000)]);
   const loginStatus = await isLoggedIn(page);
   if (!loginStatus) {
     await (0, _accountLogin.default)(page, useremail, password);

package/build/core/playwright/index.js

@@ -22,26 +22,16 @@ var _test = require("@playwright/test");
 var _readConfigFile = require("./readConfigFile");
 var _builtInFixtures = _interopRequireDefault(require("./builtInFixtures"));
 var _getUserFixtures = _interopRequireDefault(require("./helpers/getUserFixtures"));
-// import {
-//   accountLogin,
-//   getRunMode,
-//   isCI,
-//   isDevelopmentSetup,
-//   getListOfActors,
-//   getDefaultActor,
-//   getUserForSelectedEditionAndProfile,
-//   loadCookiesIfPresent,
-//   performLoginSteps,
-//   verifyIfCookieFileExists
-// } from './helpers/auth/index';
-
 const {
   bddMode
 } = (0, _readConfigFile.generateConfigFromFile)();
 let base = bddMode ? _bddFramework.test : _test.test;
 const buildInFixtures = (0, _builtInFixtures.default)(bddMode);
+const buildInFixturesTest = base.extend({
+  ...buildInFixtures
+});
 const userFixtures = (0, _getUserFixtures.default)();
-const test = exports.test = base.extend({
-  ...buildInFixtures,
+const userFixturesTest = base.extend({
   ...userFixtures
-});
+});
+const test = exports.test = (0, _test.mergeTests)(buildInFixturesTest, userFixturesTest);

package/changelog.md

@@ -1,6 +1,11 @@
 # Testing Framework
 
 ## Framework that abstracts the configuration for playwright and Jest
+# 0.2.4
+- Issue fixes on custom fixtures
+  - Page Fixture
+  - i18n Fixture
+  
 # 0.2.1
 **Issue Fixes**
 - Fixes issue in actors configuration

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "",
   "main": "./build/index.js",
   "scripts": {