@zohodesk/testinglibrary 0.4.66-n18-experimental → 0.4.68-n18-experimental

package/.gitlab-ci.yml

@@ -115,3 +115,35 @@ uat-nobdd:
     when: always
     paths:
       - nobdd/uat/playwright-report
+
+
+uatmodule:
+  stage: uat
+  script:
+    - cd examples
+    - npm install $(npm pack ../../testing-framework | tail -1)
+    - output=$(npm run uatmodule)
+    - echo "$output"
+    - node ../ValidateUATReport.js examples
+
+
+  artifacts:
+    when: always
+    paths:
+      - examples/uat/playwright-report
+
+uatconfigmodule:
+  stage: uat
+  script:
+    - cd examples
+    - npm install $(npm pack ../../testing-framework | tail -1)
+    - output=$(npm run uatconfigmodule)
+    - echo "$output"
+    - node ../ValidateUATReport.js examples
+
+  artifacts:
+    when: always
+    paths:
+      - examples/uat/playwright-report
+
+      

package/build/core/playwright/custom-commands.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CUSTOM_COMMANDS = void 0;
-const CUSTOM_COMMANDS = exports.CUSTOM_COMMANDS = ['mode', 'tags', 'edition', 'browsers', 'filePath', 'headless'];
+const CUSTOM_COMMANDS = exports.CUSTOM_COMMANDS = ['mode', 'tags', 'edition', 'browsers', 'filePath', 'headless', 'modules'];

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

@@ -13,8 +13,7 @@ async function accountLogin(page, useremail, password) {
   await page.locator('#nextbtn').click();
   const domainUrlOrigin = (0, _getUrlOrigin.default)(process.env.domain);
   await page.waitForNavigation();
-  if (page.url().includes('announcement')) {
-    console.log("Detected 'sessions-reminder' or 'announcement' page. Redirecting to domain origin:", domainUrlOrigin);
+  if (!page.url().includes(domainUrlOrigin)) {
     await page.goto(domainUrlOrigin);
   }
   await page.waitForURL(`${domainUrlOrigin}/**`);

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

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

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getBrowsersList = getBrowsersList;
+exports.getModulePathForFeatureFiles = getModulePathForFeatureFiles;
 exports.getProjects = getProjects;
 exports.getTestDir = getTestDir;
 var _test = require("@playwright/test");
@@ -140,9 +141,27 @@ function getPathsForFeatureFiles(cwd) {
       _logger.Logger.log(_logger.Logger.INFO_TYPE, `Unable to read test summary from the ${reportPath}. Verify If File Exists in the path`);
       _logger.Logger.log(_logger.Logger.INFO_TYPE, 'Going to run all test cases');
     }
+  } else if (process.env.modules !== 'undefined' && process.env.modules.length > 0) {
+    let modules = process.env.modules;
+    let moduleList = modules.split(',');
+    return getModulePathForFeatureFiles(moduleList);
   }
   return [_path.default.join(cwd, 'uat', '**', '*.feature')];
 }
+function getModulePathForFeatureFiles(moduleList) {
+  let validModuleList = [];
+  moduleList.forEach(moduleName => {
+    let modulePath = _path.default.join(process.cwd(), 'uat', 'modules', '**', `${moduleName}`);
+    if ((0, _fileUtils.checkIfFolderExistsWithPattern)(modulePath)) {
+      validModuleList.push(_path.default.join(modulePath, '**', '*.feature'));
+    } else {
+      _logger.Logger.log(_logger.Logger.FAILURE_TYPE, `Module ${moduleName} does not exist, Please check the module name`);
+      validModuleList = [];
+      return validModuleList;
+    }
+  });
+  return validModuleList;
+}
 function getTestDir(bddMode, cwd, {
   stepDefinitionsFolder
 }) {

package/build/core/playwright/setup/qc-custom-reporter.js

@@ -10,9 +10,9 @@ var _path = _interopRequireDefault(require("path"));
 var _codeFrame = require("@babel/code-frame");
 class CustomJsonReporter {
   constructor({
-    outputFile = 'playwright-custom-report.json'
+    outputFile = 'test-results.json'
   } = {}) {
-    this.outputFile = _path.default.resolve(outputFile);
+    this.outputFile = _path.default.resolve(process.cwd(), 'uat/test-results/', outputFile);
     this.rootSuite = null;
     this.report = {
       config: {},

package/build/core/playwright/test-runner.js

@@ -83,15 +83,16 @@ function runPlaywright(command, args) {
 function main() {
   // Getting the default config's from framework
   const uatConfig = new _Configuration.default((0, _readConfigFile.getDefaultConfig)());
-
   // overriding the application config's from project
-
   const userArgConfig = new _Configuration.default(_UserArgs.default.parseToObject(process.argv.slice(2)));
   const mode = userArgConfig.get("mode");
   uatConfig.addAll(new _Configuration.default((0, _ConfigurationHelper.getApplicationConfig)(mode)));
-
   // overriding the user config's from CLI
   uatConfig.addAll(userArgConfig);
+  const modules = uatConfig.get('modules');
+
+  //We need to change this process.env variable to pass the module name in future.
+  process.env.modules = modules;
   const {
     isAuthMode,
     editionOrder,

package/build/core/playwright/types.js

@@ -39,5 +39,6 @@
  * @property {string} testIdAttribute: Change the default data-testid attribute. configure what attribute to search while calling getByTestId
  * @property {Array} editionOrder: Order in the form of larger editions in the back. Edition with the most privelages should be last
  * @property {testSetupConfig} testSetup: Specify page and context functions that will be called while intilaizing fixtures.
+ * @property {string} modules: Modules name to be used for running the specific module test cases.
  */
 "use strict";

package/build/utils/fileUtils.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.checkIfFileExists = checkIfFileExists;
+exports.checkIfFolderExistsWithPattern = checkIfFolderExistsWithPattern;
 exports.deleteFile = deleteFile;
 exports.deleteFolder = deleteFolder;
 exports.readFileContents = readFileContents;
@@ -12,6 +13,9 @@ exports.writeFileContents = writeFileContents;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
 var _logger = require("./logger");
+var glob = _interopRequireWildcard(require("glob"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function checkIfFileExists(file) {
   try {
     _fs.default.accessSync(file, _fs.default.constants.F_OK);
@@ -69,4 +73,18 @@ function deleteFolder(folderPath) {
       throw new Error(`Error while deleting the test data file: ${folderPath}`);
     }
   }
+}
+
+// This function uses glob to check if a folder exists with a specific pattern
+// Glob is define patterns for matching file and directory names based on wildcards
+function checkIfFolderExistsWithPattern(folderPath) {
+  try {
+    if (glob.sync(folderPath).length > 0) {
+      return true;
+    }
+    return false;
+  } catch (err) {
+    _logger.Logger.error(err);
+    return false;
+  }
 }

package/npm-shrinkwrap.json

@@ -1,19 +1,19 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.4.66-n18-experimental",
+  "version": "0.4.68-n18-experimental",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@zohodesk/testinglibrary",
-      "version": "0.4.66-n18-experimental",
+      "version": "0.4.68-n18-experimental",
       "hasInstallScript": true,
       "license": "ISC",
       "dependencies": {
         "@babel/code-frame": "7.27.1",
         "@babel/preset-react": "7.22.5",
         "@cucumber/cucumber": "11.2.0",
-        "@playwright/test": "1.51.1",
+        "@playwright/test": "1.52.0",
         "@reportportal/agent-js-playwright": "5.1.11",
         "@testing-library/jest-dom": "5.11.9",
         "@testing-library/react": "11.2.7",
@@ -24,7 +24,7 @@
         "jest": "29.6.2",
         "jest-environment-jsdom": "29.6.2",
         "msw": "1.2.3",
-        "playwright": "1.51.1",
+        "playwright": "1.52.0",
         "playwright-bdd": "8.2.1",
         "supports-color": "8.1.1"
       },
@@ -3095,12 +3095,12 @@
       }
     },
     "node_modules/@playwright/test": {
-      "version": "1.51.1",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.51.1.tgz",
-      "integrity": "sha512-nM+kEaTSAoVlXmMPH10017vn3FSiFqr/bh4fKg9vmAdMfd9SDqRZNvPSiAHADc/itWak+qPvMPZQOPwCBW7k7Q==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz",
+      "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright": "1.51.1"
+        "playwright": "1.52.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -8661,12 +8661,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.51.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.51.1.tgz",
-      "integrity": "sha512-kkx+MB2KQRkyxjYPc3a0wLZZoDczmppyGJIvQ43l+aZihkaVvmu/21kiyaHeHjiFxjxNNFnUncKmcGIyOojsaw==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.52.0.tgz",
+      "integrity": "sha512-JAwMNMBlxJ2oD1kce4KPtMkDeKGHQstdpFPcPH3maElAXon/QZeTvtsfXmTMRyO9TslfoYOXkSsvao2nE1ilTw==",
       "license": "Apache-2.0",
       "dependencies": {
-        "playwright-core": "1.51.1"
+        "playwright-core": "1.52.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -8834,9 +8834,9 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.51.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.51.1.tgz",
-      "integrity": "sha512-/crRMj8+j/Nq5s8QcvegseuyeZPxpQCZb6HNk3Sos3BlZyAknRjoyJPFWkpNn8v0+P3WiwqFF8P+zQo4eqiNuw==",
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.52.0.tgz",
+      "integrity": "sha512-l2osTgLXSMeuLZOML9qYODUQoPPnUsKsb5/P6LJ2e6uPKXUdPK5WYhN4z03G+YNbWmGDY4YENauNu4ZKczreHg==",
       "license": "Apache-2.0",
       "bin": {
         "playwright-core": "cli.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.4.66-n18-experimental",
+  "version": "0.4.68-n18-experimental",
   "description": "",
   "main": "./build/index.js",
   "scripts": {
@@ -24,7 +24,7 @@
     "@babel/code-frame": "7.27.1",
     "@babel/preset-react": "7.22.5",
     "@cucumber/cucumber": "11.2.0",
-    "@playwright/test": "1.51.1",
+    "@playwright/test": "1.52.0",
     "@reportportal/agent-js-playwright": "5.1.11",
     "@testing-library/jest-dom": "5.11.9",
     "@testing-library/react": "11.2.7",
@@ -35,9 +35,9 @@
     "jest": "29.6.2",
     "jest-environment-jsdom": "29.6.2",
     "msw": "1.2.3",
-    "playwright": "1.51.1",
-    "playwright-bdd": "8.2.1",
-    "supports-color": "8.1.1"
+    "playwright": "1.52.0",
+    "supports-color": "8.1.1",
+    "playwright-bdd": "8.2.1"
   },
   "bin": {
     "ZDTestingFramework": "./bin/cli.js"

package/playwright.config.js

@@ -8,10 +8,7 @@ export default defineConfig({
   outputDir: path.join(process.cwd(), 'uat', 'test-results'),
   fullyParallel: true,
   retries: process.env.CI ? 2 : 0,
-  reporter: [
-    ['html', { outputFolder: path.join(process.cwd(), 'uat', 'playwright-report'), open: "always" }],
-    ['./src/core/playwright/setup/qc-custom-reporter.js'] 
-  ],
+  reporter: [['html', { outputFolder: path.join(process.cwd(), 'uat', 'playwright-report'), open: "always" }]],
   timeout: 60 * 1000,
   expect: {
     timeout: 5 * 1000,