@zohodesk/testinglibrary 0.4.74-n18-experimental → 0.4.76-n18-experimental

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

@@ -38,9 +38,17 @@ const projects = (0, _configUtils.getProjects)({
   testTimeout,
   viewport
 });
-const testDir = (0, _configUtils.getTestDir)(bddMode, process.cwd(), {
-  featureFilesFolder,
-  stepDefinitionsFolder
+const testDir = (0, _configUtils.getTestDir)(bddMode, {
+  featureFilesFolder: (0, _configUtils.getPathsForFeatureFiles)(process.cwd()),
+  stepDefinitionsFolder: _path.default.join(process.cwd(), 'uat', '**', 'steps', '*.spec.js'),
+  outputDir: _path.default.join(process.cwd(), 'uat', '.features-gen'),
+  uatPath: _path.default.join(process.cwd(), 'uat')
+});
+const smokeTestDir = (0, _configUtils.getTestDir)(bddMode, {
+  featureFilesFolder: _path.default.join(process.cwd(), 'uat', 'smokeTest', '**', '*.feature'),
+  stepDefinitionsFolder: _path.default.join(process.cwd(), 'uat', 'smokeTest', '**', '*smokeTest.spec.js'),
+  outputDir: _path.default.join(process.cwd(), 'uat', '.features-smoke-gen'),
+  uatPath: _path.default.join(process.cwd(), 'uat', 'smokeTest')
 });
 const use = {
   trace,
@@ -69,15 +77,14 @@ function getPlaywrightConfig() {
     storageState: isAuthMode ? (0, _readConfigFile.getAuthFilePath)(_path.default.resolve(process.cwd(), authFilePath)) : {}
   };
   const dependencies = isAuthMode ? ['setup'] : [];
-  const smokeTestProject = isSmokeTest ? {
+  const smokeTestProject = {
     name: 'smokeTest',
-    testMatch: /.*\.smokeTest\.js/,
-    testDir: _path.default.join(process.cwd(), 'uat'),
+    testDir: smokeTestDir,
     use: {
       ...commonConfig
     },
     dependencies: dependencies
-  } : {};
+  };
   const playwrightConfig = {
     testDir,
     globalTimeout: globalTimeout || 3600000,
@@ -94,11 +101,11 @@ function getPlaywrightConfig() {
       testMatch: /.*\.setup\.js/,
       testDir: _path.default.join(process.cwd(), 'uat'),
       teardown: 'cleanup'
-    }, smokeTestProject, {
+    }, ...(isSmokeTest ? [smokeTestProject] : []), {
       name: 'cleanup',
       testMatch: /.*\.teardown\.js/,
       testDir: _path.default.join(process.cwd(), 'uat')
-    }, ...projects] : [...projects, smokeTestProject],
+    }, ...projects] : [...projects, ...(isSmokeTest ? [smokeTestProject] : [])],
     ...uatConfig
   };
   return playwrightConfig;

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getBrowsersList = getBrowsersList;
 exports.getModulePathForFeatureFiles = getModulePathForFeatureFiles;
+exports.getPathsForFeatureFiles = getPathsForFeatureFiles;
 exports.getProjects = getProjects;
 exports.getTestDir = getTestDir;
 var _test = require("@playwright/test");
@@ -35,7 +36,8 @@ function getBrowserConfig({
     storageState: isAuthMode ? (0, _readConfigFile.getAuthFilePath)(_path.default.resolve(process.cwd(), authFilePath)) : {}
   };
   // Determine dependencies based on the mode and smoke test status
-  const dependencies = isSmokeTest ? isAuthMode ? ['setup', 'smokeTest'] : ['smokeTest'] : isAuthMode ? ['setup'] : [];
+  let dependencies = isAuthMode ? ['setup'] : [];
+  dependencies = isSmokeTest ? [...dependencies, 'smokeTest'] : dependencies;
   if (browser === 'chrome') {
     return {
       name: _browserTypes.BROWSER_PROJECT_MAPPING.CHROME,
@@ -167,18 +169,21 @@ function getModulePathForFeatureFiles(moduleList) {
   });
   return validModuleList;
 }
-function getTestDir(bddMode, cwd, {
-  stepDefinitionsFolder
+function getTestDir(bddMode, {
+  featureFilesFolder,
+  stepDefinitionsFolder,
+  outputDir,
+  uatPath
 }) {
   return bddMode ? (0, _playwrightBdd.defineBddConfig)({
-    features: getPathsForFeatureFiles(cwd),
-    steps: [_path.default.join(cwd, 'uat', '**', stepDefinitionsFolder, '*.spec.js'), require.resolve('../fixtures.js')],
+    features: featureFilesFolder,
+    steps: [stepDefinitionsFolder, require.resolve('../fixtures.js')],
     importTestFrom: require.resolve('../fixtures.js'),
-    featuresRoot: _path.default.join(cwd, 'uat'),
-    outputDir: _path.default.join(cwd, 'uat', '.features-gen'),
+    featuresRoot: uatPath,
+    outputDir: outputDir,
     disableWarnings: {
       importTestFrom: true
     },
     publish: true
-  }) : _path.default.join(cwd, 'uat');
+  }) : uatPath;
 }

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

@@ -105,7 +105,7 @@ function main() {
   //This is only used for pass the user arguments to need places in legacy code. We need to rewamp that also.
   const userArgsObject = userArgConfig.getAll();
   const tagProcessor = new _tagProcessor.default(editionOrder);
-  const tagArgs = tagProcessor.processTags(userArgsObject);
+  const tagArgs = tagProcessor.processTags(uatConfig.getAll());
   const runnerObj = new _Runner.default();
   runnerObj.setTagArgs(tagArgs);
   runnerObj.setUserArgs(userArgsObject);

package/build/test/Test.js

@@ -0,0 +1,13 @@
+"use strict";
+
+delete require.cache[require.resolve('../core/playwright/runner/Runner')];
+function test() {
+  const inputString = "@hc";
+  const selectedTag = ["@hc_1234"].reverse().find(tag => tag.startsWith(inputString));
+  let tagInput = null;
+  if (selectedTag) {
+    tagInput = selectedTag.split(`${inputString}_`).pop().toLowerCase();
+  }
+  console.log(tagInput);
+}
+test();

package/build/utils/fileUtils.js

@@ -14,8 +14,7 @@ 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 _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function checkIfFileExists(file) {
   try {
     _fs.default.accessSync(file, _fs.default.constants.F_OK);