@zohodesk/testinglibrary 0.1.8-stb-bdd-v6 → 0.1.8-stb-bdd-v8

package/build/bdd-poc/core-runner/exportMethods.js

@@ -10,11 +10,13 @@ function Given(description, callback) {
 const Then = Given;
 const When = Given;
 const And = Given;
+const Step = Given;
 function createBdd() {
   return {
     Given,
     When,
     Then,
-    And
+    And,
+    Step
   };
 }

package/build/bdd-poc/core-runner/stepDefinitions.js

@@ -42,11 +42,13 @@ function getInputArray(description, argument) {
 const $When = $Given;
 const $And = $Given;
 const $Then = $Given;
+const $Step = $Given;
 function createNativeBDD() {
   return {
     $Given,
     $When,
     $And,
-    $Then
+    $Then,
+    $Step
   };
 }

package/build/bdd-poc/test/cucumber/featureFileParer.js

@@ -71,14 +71,12 @@ function testDataExtraction(tableHeader, tableBody) {
   const result = [];
   if (tableBody && tableHeader) {
     tableBody.forEach(array => {
-      const obj = {};
+      const InputObject = {};
       array.forEach((item, index) => {
-        obj[`<${tableHeader[index]}>`] = item;
+        InputObject[`<${tableHeader[index]}>`] = item;
       });
-      result.push(obj);
+      result.push(InputObject);
     });
-  } else {
-    return;
   }
   return result;
 }

package/build/bdd-poc/test/tagsHandle.js

@@ -1,69 +1,70 @@
-"use strict";
+// const editionOrder = ['Free','Express','Standard','Professional','Enterprise']
+// import { buildEditionTags} from '../../core/playwright/tag-processor'
+// function allowedTags(userArgs){
+//     let tags = userArgs?.tags || null
+//     if(tags){
+//         if(Array.isArray(tags)){
+//             return buildGrepTags(tags,'|')
+//         }
+//         return tags;
+//     }
+//     let edition = userArgs?.edition || null
+//     if(edition){
+//         const editionFrmCli = edition.split(',')
+//         if(editionFrmCli.length === 1){
+//             // const sortedEdition = editionPreprocessing(editionOrder,editionFrmCli)
+//             return buildEditionTags(expressionHandle(editionFrmCli,editionOrder),'|')
+//         }
+//     }
+//     return;
+// }
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.allowedTags = allowedTags;
-exports.expressionHandle = expressionHandle;
-var _tagProcessor = require("../../core/playwright/tag-processor");
-const editionOrder = ['Free', 'Express', 'Standard', 'Professional', 'Enterprise'];
-function allowedTags(userArgs) {
-  let tags = (userArgs === null || userArgs === void 0 ? void 0 : userArgs.tags) || null;
-  if (tags !== null) {
-    if (Array.isArray(tags)) {
-      return buildGrepTags(tags, '|');
-    }
-    return tags;
-  }
-  let edition = (userArgs === null || userArgs === void 0 ? void 0 : userArgs.edition) || null;
-  if (edition !== null) {
-    const editionFrmCli = edition.split(',');
-    if (editionFrmCli.length === 1) {
-      // const sortedEdition = editionPreprocessing(editionOrder,editionFrmCli)
-      return (0, _tagProcessor.buildEditionTags)(expressionHandle(editionFrmCli, editionOrder), '|');
-    }
-  }
-  return;
-}
-function buildGrepTags(tags, operator) {
-  return tags.join(`${operator}`);
-}
-function expressionHandle(editionFrmCli, editionOrder) {
-  var expression;
-  var $edition;
-  if (editionFrmCli.split('=').length !== 1) {
-    expression = editionFrmCli.split('').slice(0, 2).join('');
-    $edition = editionFrmCli.split('=').pop();
-  } else if (editionFrmCli.split('>').length !== 1) {
-    expression = editionFrmCli.split('').slice(0, 1).join('');
-    $edition = editionFrmCli.split('>').pop();
-  } else {
-    expression = editionFrmCli.split('').slice(0, 1).join('');
-    $edition = editionFrmCli.split('<').pop();
-  }
-  const index_Edition = editionOrder.indexOf($edition);
-  switch (expression) {
-    case '>=':
-      if ($edition == editionOrder[editionOrder.length - 1]) {
-        return editionOrder[editionOrder.length - 1];
-      }
-      return editionOrder.slice(0, index_Edition);
-    case '<=':
-      if ($edition == editionOrder[0]) {
-        return editionOrder.slice(1, editionOrder.length + 1);
-      }
-      return editionOrder.slice(index_Edition + 1, editionOrder.length + 1);
-    case '<':
-      if ($edition == editionOrder[0]) {
-        return editionOrder;
-      }
-      return editionOrder.slice(index_Edition, editionOrder.length + 1);
-    case '>':
-      if ($edition == editionOrder[editionOrder.length - 1]) {
-        return editionOrder;
-      }
-      return editionOrder.slice(0, index_Edition + 1);
-    default:
-      break;
-  }
-}
+// function buildGrepTags(tags,operator){
+//     return tags.join(`${operator}`)
+// }
+
+// function expressionHandle(editionFrmCli,editionOrder){
+//     var expression;
+//     var $edition;
+//     if(editionFrmCli.split('=').length !== 1){
+//         expression = editionFrmCli.split('').slice(0,2).join('');
+//         $edition = editionFrmCli.split('=').pop()
+//     }else if(editionFrmCli.split('>').length !== 1){
+//         expression = editionFrmCli.split('').slice(0,1).join('');
+//         $edition = editionFrmCli.split('>').pop()
+//     }else {
+//         expression = editionFrmCli.split('').slice(0,1).join('');
+//         $edition = editionFrmCli.split('<').pop()
+//     }
+//     const index_Edition = editionOrder.indexOf($edition)
+//     switch(expression){
+//         case '>=':
+//             if($edition == editionOrder[editionOrder.length-1]){
+//                 return editionOrder[editionOrder.length-1]
+//             }
+//             return editionOrder.slice(0,index_Edition);
+//         case '<=':
+//             if($edition == editionOrder[0]){
+//                 return editionOrder.slice(1,editionOrder.length + 1)
+//             }
+//             return editionOrder.slice(index_Edition+1,editionOrder.length+1);
+//         case '<':
+//             if($edition == editionOrder[0]){
+//                 return editionOrder;
+//             }
+//             return editionOrder.slice(index_Edition, editionOrder.length + 1);
+//         case '>':
+//             if($edition == editionOrder[editionOrder.length-1]){
+//                 return editionOrder;
+//             }
+//             return editionOrder.slice(0,index_Edition+1);
+//         default:
+//             break;
+//     }
+// }
+
+// export {
+//     allowedTags,
+//     expressionHandle
+// }
+"use strict";

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

@@ -10,6 +10,9 @@ var _context = _interopRequireDefault(require("./context"));
 var _cacheLayer = _interopRequireDefault(require("./cacheLayer"));
 // import addTags from './addTags';
 
+const addTags = {
+  $tags: ({}, use) => use([])
+};
 function getBuiltInFixtures(bddMode) {
   let builtInFixtures = {
     ..._page.default,
@@ -18,8 +21,8 @@ function getBuiltInFixtures(bddMode) {
   };
   if (bddMode) {
     builtInFixtures = {
-      ...builtInFixtures
-      // ...addTags
+      ...builtInFixtures,
+      ...addTags
     };
   }
   return builtInFixtures;

package/build/core/playwright/tag-processor.js

@@ -9,9 +9,10 @@ exports.tagProcessor = tagProcessor;
 var _logger = require("../../utils/logger");
 /* eslint-disable dot-notation */
 
-function getTagsString(tags, editionTags) {
-  return tags && tags !== '' ? `${tags} and not (${editionTags})` : `not (${editionTags})`;
-}
+// function getTagsString(tags, editionTags) {
+//   return tags && tags !== '' ? `${tags} and not (${editionTags})` : `not (${editionTags})`;
+// }
+
 function getEdition(edition) {
   if (edition.startsWith('<=')) {
     return ['<=', edition.slice(2)];
@@ -45,26 +46,34 @@ function editionPreprocessing(editionOrder, selectedEdition) {
   _logger.Logger.log(_logger.Logger.INFO_TYPE, `No matching editions ${selectedEdition} found. Running with default edition`);
   return [];
 }
-function buildEditionTags(editionArgs, operator) {
-  return editionArgs.map(edition => `@edition_${edition}`).join(` ${operator} `);
+function buildEditionTags(editionArgs, operator, prefix = "") {
+  return editionArgs.map(edition => `${prefix}${edition}`).join(` ${operator} `);
 }
 function tagProcessor(userArgsObject, editionOrder) {
+  let filteredTags;
   let tagArgs = userArgsObject['tags'];
+  let multiTags = userArgsObject['tags'] || " ";
+  if (multiTags.split(',').length >= 2) {
+    tagArgs = buildEditionTags(multiTags.split(','), '|');
+  }
   const edition = userArgsObject['edition'] || null;
   if (edition !== null) {
     let editionsArray = edition.split(',');
     if (editionsArray.length === 1) {
       const editionArgs = editionPreprocessing(editionOrder, edition);
       if (editionArgs && editionArgs.length > 0) {
-        const editionTags = buildEditionTags(editionArgs, 'or');
-        tagArgs = `${getTagsString(tagArgs, editionTags)}`;
+        const editionTags = buildEditionTags(editionArgs, '|', "@edition_");
+        filteredTags = editionTags;
       }
     } else {
       // More than one edition given
       const filteredEditions = editionOrder.filter(edition => !editionsArray.includes(edition));
-      const editionTags = buildEditionTags(filteredEditions, 'or');
-      tagArgs = `${getTagsString(tagArgs, editionTags)}`;
+      const editionTags = buildEditionTags(filteredEditions, '|', "@edition_");
+      filteredTags = editionTags;
     }
   }
-  return tagArgs;
+  return {
+    tags: tagArgs,
+    editionTags: filteredTags
+  };
 }

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

@@ -15,7 +15,8 @@ var _readConfigFile = require("./readConfigFile");
 var _rootPath = require("../../utils/rootPath");
 var _tagProcessor = require("./tag-processor");
 var _bddPoc = require("../../bdd-poc");
-var _tagsHandle = require("../../bdd-poc/test/tagsHandle");
+// import { allowedTags } from '../../bdd-poc/test/tagsHandle';
+
 function parseUserArgs() {
   return (0, _cliArgsToObject.cliArgsToObject)(process.argv.slice(2));
 }
@@ -24,9 +25,25 @@ function getPlaywrightArgs(userArgsObject, debug, bddMode, tagArgs, headless) {
   if (debug) {
     playwrightArgs.push('--debug');
   }
-  if (!bddMode && tagArgs) {
-    playwrightArgs.push('--grep');
-    playwrightArgs.push(tagArgs);
+
+  // if (!bddMode && tagArgs) {
+  //   playwrightArgs.push('--grep');
+  //   playwrightArgs.push(tagArgs);
+  // }
+
+  if (tagArgs && userArgsObject !== null && userArgsObject !== void 0 && userArgsObject.edition || userArgsObject !== null && userArgsObject !== void 0 && userArgsObject.tags) {
+    const {
+      tags,
+      editionTags
+    } = tagArgs;
+    if (tags) {
+      playwrightArgs.push('--grep');
+      playwrightArgs.push(tags);
+    }
+    if (editionTags) {
+      playwrightArgs.push('--grep-invert');
+      playwrightArgs.push(editionTags);
+    }
   }
   if (!headless && !userArgsObject.headed) {
     playwrightArgs.push('--headed');
@@ -101,6 +118,8 @@ function main() {
     editionOrder
   } = (0, _readConfigFile.generateConfigFromFile)();
   const tagArgs = (0, _tagProcessor.tagProcessor)(userArgsObject, editionOrder);
+  // const tagArgs =  allowedTags(userArgsObject)
+
   const playwrightArgs = getPlaywrightArgs(userArgsObject, debug, bddMode, tagArgs, headless);
   (0, _envInitializer.initializeEnvConfig)(userArgsObject.mode ? userArgsObject.mode : mode);
   const playwrightPath = _path.default.resolve((0, _rootPath.getExecutableBinaryPath)('playwright'));
@@ -109,14 +128,6 @@ function main() {
   let promises = [];
   if (bddMode) {
     promises.push((0, _bddPoc.createCucumberBDD)());
-    if (userArgsObject !== null && userArgsObject !== void 0 && userArgsObject.edition || userArgsObject !== null && userArgsObject !== void 0 && userArgsObject.tags) {
-      if (userArgsObject !== null && userArgsObject !== void 0 && userArgsObject.edition) {
-        playwrightArgs.push('--grep-invert');
-      } else {
-        playwrightArgs.push('--grep');
-      }
-      playwrightArgs.push((0, _tagsHandle.allowedTags)(userArgsObject));
-    }
   }
   const args = ['test', '--config', configPath].concat(playwrightArgs);
   Promise.all(promises).then(() => runPlaywright(command, args)).catch(err => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zohodesk/testinglibrary",
-  "version": "0.1.8-stb-bdd-v6",
+  "version": "0.1.8-stb-bdd-v8",
   "description": "",
   "main": "./build/index.js",
   "scripts": {