@zohodesk/testinglibrary 0.1.8-exp-bdd-v1 → 0.1.8-exp.1

package/build/bdd-framework/run/bddWorld.js

@@ -6,58 +6,46 @@ Object.defineProperty(exports, "__esModule", {
 exports.BddWorld = void 0;
 exports.getWorldConstructor = getWorldConstructor;
 var _cucumber = require("@cucumber/cucumber");
-var _loadSteps = require("../cucumber/loadSteps");
-var _getLocationInFile = require("../playwright/getLocationInFile");
-var _testTypeImpl = require("../playwright/testTypeImpl");
-var _defineStep = require("../stepDefinitions/defineStep");
 class BddWorld extends _cucumber.World {
   options;
-  builtinFixtures;
-  customFixtures;
+  stepFixtures = {};
   constructor(options) {
     super(options);
     this.options = options;
-    this.invokeStep = this.invokeStep.bind(this);
   }
-  async invokeStep(text, argument, customFixtures) {
-    const stepDefinition = (0, _loadSteps.findStepDefinition)(this.options.supportCodeLibrary, text, this.testInfo.file);
-    if (!stepDefinition) {
-      throw new Error(`Undefined step: "${text}"`);
-    }
-    // attach custom fixtures to world - the only way to pass them to cucumber step fn
-    this.customFixtures = customFixtures;
-    const code = (0, _defineStep.getStepCode)(stepDefinition);
-    // Get location of step call in generated test file.
-    // This call must be exactly here to have correct call stack.
-    const location = (0, _getLocationInFile.getLocationInFile)(this.test.info().file);
-    const {
-      parameters
-    } = await stepDefinition.getInvocationParameters({
-      hookParameter: {},
-      step: {
-        text,
-        argument
-      },
-      world: this
-    });
-    const res = await (0, _testTypeImpl.runStepWithCustomLocation)(this.test, text, location, () => code.apply(this, parameters));
-    delete this.customFixtures;
-    return res;
+  /**
+     * Use particular fixture in cucumber-style steps.
+     *
+     * Note: TS does not support partial generic inference,
+     * that's why we can't use this.useFixture<typeof test>('xxx');
+     * The solution is to pass TestType as a generic to BddWorld
+     * and call useFixture without explicit generic params.
+     * Finally, it looks even better as there is no need to pass `typeof test`
+     * in every `this.useFixture` call.
+     *
+     * The downside - it's impossible to pass fixtures type directly to `this.useFixture`
+     * like it's done in @Fixture decorator.
+     *
+     * See: https://stackoverflow.com/questions/45509621/specify-only-first-type-argument
+     * See: https://github.com/Microsoft/TypeScript/pull/26349
+     */
+  useFixture(fixtureName) {
+    return this.stepFixtures[fixtureName];
   }
   get page() {
-    return this.builtinFixtures.page;
+    return this.options.$bddWorldFixtures.page;
   }
   get context() {
-    return this.builtinFixtures.context;
+    return this.options.$bddWorldFixtures.context;
   }
   get browser() {
-    return this.builtinFixtures.browser;
+    return this.options.$bddWorldFixtures.browser;
   }
   get browserName() {
-    return this.builtinFixtures.browserName;
+    return this.options.$bddWorldFixtures.browserName;
   }
   get request() {
-    return this.builtinFixtures.request;
+    return this.options.$bddWorldFixtures.request;
   }
   get testInfo() {
     return this.options.testInfo;

package/build/bdd-framework/snippets/index.js

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Snippets = void 0;
+var _url = require("url");
 var _loadSnippetBuilder = require("../cucumber/loadSnippetBuilder");
 var _logger = require("../utils/logger");
 var _stepConfig = require("../stepDefinitions/stepConfig");
-/**
- * Generate and show snippets for undefined steps
+/**
+ * Generate and show snippets for undefined steps
  */
 
 class Snippets {
@@ -43,7 +44,8 @@ class Snippets {
     } = this.runConfiguration.formats.options;
     if (!snippetSyntax && this.isPlaywrightStyle()) {
       this.bddBuiltInSyntax = true;
-      return this.isDecorators() ? require.resolve('./snippetSyntaxDecorators.js') : this.isTypeScript() ? require.resolve('./snippetSyntaxTs.js') : require.resolve('./snippetSyntax.js');
+      const filePath = this.isDecorators() ? require.resolve('./snippetSyntaxDecorators.js') : this.isTypeScript() ? require.resolve('./snippetSyntaxTs.js') : require.resolve('./snippetSyntax.js');
+      return (0, _url.pathToFileURL)(filePath).toString();
     } else {
       return snippetSyntax;
     }

package/build/bdd-framework/snippets/snippetSyntax.js

@@ -27,7 +27,9 @@ class _default {
     });
     const allParameterNames = ['{}', ...expressionParameters, ...stepParameters];
     const functionSignature = `${functionName}('${this.escapeSpecialCharacters(generatedExpression)}', async (${allParameterNames.join(', ')}) => {`;
-    return [functionSignature, `  // ...`, '});'].join('\n');
+    return [functionSignature,
+    // prettier-ignore
+    `  // ...`, '});'].join('\n');
   }
   escapeSpecialCharacters(generatedExpression) {
     let source = generatedExpression.source;

package/build/bdd-framework/snippets/snippetSyntaxTs.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _snippetSyntax = _interopRequireDefault(require("./snippetSyntax"));
-/**
- * Playwright-style snippet syntax for typescript.
- * Important to use separate file as it's simplest way to distinguish between js/ts
- * without hooking into cucumber machinery.
+/**
+ * Playwright-style snippet syntax for typescript.
+ * Important to use separate file as it's simplest way to distinguish between js/ts
+ * without hooking into cucumber machinery.
  */
 
 class _default extends _snippetSyntax.default {

package/build/bdd-framework/stepDefinitions/createBdd.js

@@ -4,27 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createBdd = createBdd;
-exports.extractFixtureNames = extractFixtureNames;
-var _fixtureParameterNames = require("../playwright/fixtureParameterNames");
+exports.hasCustomTest = void 0;
 var _bddFixtures = require("../run/bddFixtures");
 var _testTypeImpl = require("../playwright/testTypeImpl");
 var _defineStep = require("./defineStep");
 var _exit = require("../utils/exit");
-/**
- * Stuff related to writing steps in Playwright-style.
+var _scenario = require("../hooks/scenario");
+var _worker = require("../hooks/worker");
+/**
+ * Stuff related to writing steps in Playwright-style.
  */
 
+// Global flag showing that custom test was passed.
+// Used when checking 'importTestFrom' config option.
+// todo: https://github.com/vitalets/playwright-bdd/issues/46
+let hasCustomTest = exports.hasCustomTest = false;
 function createBdd(customTest) {
-  const hasCustomTest = isCustomTest(customTest);
+  if (!hasCustomTest) {
+    exports.hasCustomTest = hasCustomTest = isCustomTest(customTest);
+  }
   const Given = defineStepCtor('Given', hasCustomTest);
   const When = defineStepCtor('When', hasCustomTest);
   const Then = defineStepCtor('Then', hasCustomTest);
   const Step = defineStepCtor('Unknown', hasCustomTest);
+  const Before = (0, _scenario.scenarioHookFactory)('before');
+  const After = (0, _scenario.scenarioHookFactory)('after');
+  const BeforeAll = (0, _worker.workerHookFactory)('beforeAll');
+  const AfterAll = (0, _worker.workerHookFactory)('afterAll');
   return {
     Given,
     When,
     Then,
-    Step
+    Step,
+    Before,
+    After,
+    BeforeAll,
+    AfterAll
   };
 }
 function defineStepCtor(keyword, hasCustomTest) {
@@ -37,13 +52,15 @@ function defineStepCtor(keyword, hasCustomTest) {
     });
   };
 }
-function extractFixtureNames(fn) {
-  return (0, _fixtureParameterNames.fixtureParameterNames)(fn).filter(name => !(0, _bddFixtures.isBddAutoInjectFixture)(name));
-}
 function isCustomTest(customTest) {
-  const isCustomTest = Boolean(customTest && customTest !== _bddFixtures.test);
-  if (isCustomTest && customTest && !(0, _testTypeImpl.isParentChildTest)(_bddFixtures.test, customTest)) {
-    (0, _exit.exit)(`createBdd() should use test extended from "@zohodesk/testinglibrary"`);
+  if (!customTest || customTest === _bddFixtures.test) {
+    return false;
+  }
+  assertTestHasBddFixtures(customTest);
+  return true;
+}
+function assertTestHasBddFixtures(customTest) {
+  if (!(0, _testTypeImpl.isTestContainsSubtest)(customTest, _bddFixtures.test)) {
+    (0, _exit.exit)(`createBdd() should use 'test' extended from "playwright-bdd"`);
   }
-  return isCustomTest;
 }

package/build/bdd-framework/stepDefinitions/decorators/{poms.js → class.js}

@@ -7,17 +7,17 @@ exports.Fixture = Fixture;
 exports.getPomNodeByFixtureName = getPomNodeByFixtureName;
 var _steps = require("./steps");
 var _exit = require("../../utils/exit");
-/**
- * POM classes marked with @Fixture
+/**
+ * Class level @Fixture decorator.
  */
 
-/**
- * Graph of POM class inheritance.
- * Allows to guess correct fixture by step text.
+/**
+ * Graph of POM class inheritance.
+ * Allows to guess correct fixture by step text.
  */
 const pomGraph = new Map();
-/**
- * @Fixture decorator.
+/**
+ * @Fixture decorator.
  */
 function Fixture(fixtureName) {
   // context parameter is required for decorator by TS even though it's not used
@@ -51,7 +51,9 @@ function ensureUniqueFixtureName({
 }
 function linkParentWithPomNode(Ctor, pomNode) {
   const parentCtor = Object.getPrototypeOf(Ctor);
-  if (!parentCtor) return;
+  if (!parentCtor) {
+    return;
+  }
   // if parentCtor is not in pomGraph, add it.
   // Case: parent class is not marked with @Fixture, but has decorator steps (base class)
   const parentPomNode = pomGraph.get(parentCtor) || createPomNode(parentCtor, '');
@@ -59,6 +61,8 @@ function linkParentWithPomNode(Ctor, pomNode) {
 }
 function getPomNodeByFixtureName(fixtureName) {
   for (const pomNode of pomGraph.values()) {
-    if (pomNode.fixtureName === fixtureName) return pomNode;
+    if (pomNode.fixtureName === fixtureName) {
+      return pomNode;
+    }
   }
 }

package/build/bdd-framework/stepDefinitions/decorators/steps.js

@@ -9,8 +9,8 @@ exports.linkStepsWithPomNode = linkStepsWithPomNode;
 var _bddFixtures = require("../../run/bddFixtures");
 var _buildStepDefinition = require("../../cucumber/buildStepDefinition");
 var _defineStep = require("../defineStep");
-/**
- * Define steps via decorators.
+/**
+ * Define steps via decorators.
  */
 
 // initially we sotre step data inside method,
@@ -18,8 +18,8 @@ var _defineStep = require("../defineStep");
 const decoratedStepSymbol = Symbol('decoratedStep');
 // global list of all decorator steps
 const decoratedSteps = new Set();
-/**
- * Creates @Given, @When, @Then decorators.
+/**
+ * Creates @Given, @When, @Then decorators.
  */
 function createStepDecorator(keyword) {
   return pattern => {
@@ -36,17 +36,21 @@ function createStepDecorator(keyword) {
   };
 }
 function linkStepsWithPomNode(Ctor, pomNode) {
-  if (!(Ctor !== null && Ctor !== void 0 && Ctor.prototype)) return;
+  if (!(Ctor !== null && Ctor !== void 0 && Ctor.prototype)) {
+    return;
+  }
   const propertyDescriptors = Object.getOwnPropertyDescriptors(Ctor.prototype);
   return Object.values(propertyDescriptors).forEach(descriptor => {
     const stepConfig = getStepConfigFromMethod(descriptor);
-    if (!stepConfig) return;
+    if (!stepConfig) {
+      return;
+    }
     stepConfig.pomNode = pomNode;
     decoratedSteps.add(stepConfig);
   });
 }
-/**
- * Append decorator steps to Cucumber's supportCodeLibrary.
+/**
+ * Append decorator steps to Cucumber's supportCodeLibrary.
  */
 function appendDecoratorSteps(supportCodeLibrary) {
   decoratedSteps.forEach(stepConfig => {
@@ -65,7 +69,9 @@ function appendDecoratorSteps(supportCodeLibrary) {
       pattern,
       code,
       line: 0,
+      // not used in playwright-bdd
       options: {},
+      // not used in playwright-bdd
       uri: '' // not used in playwright-bdd
     }, supportCodeLibrary);
     supportCodeLibrary.stepDefinitions.push(stepDefinition);

package/build/bdd-framework/stepDefinitions/defineStep.js

@@ -8,9 +8,9 @@ exports.defineStep = defineStep;
 exports.getStepCode = getStepCode;
 var _cucumber = require("@cucumber/cucumber");
 var _exit = require("../utils/exit");
-/**
- * Defines step by config.
- * Calls cucumber's Given(), When(), Then() under the hood.
+/**
+ * Defines step by config.
+ * Calls cucumber's Given(), When(), Then() under the hood.
  */
 function defineStep(stepConfig) {
   const {
@@ -34,7 +34,8 @@ function defineStep(stepConfig) {
 }
 function buildCucumberStepCode(stepConfig) {
   const code = function (...args) {
-    const fixturesArg = Object.assign({}, this.customFixtures, {
+    // build the first argument (fixtures) for step fn
+    const fixturesArg = Object.assign({}, this.stepFixtures, {
       $testInfo: this.testInfo,
       $test: this.test,
       $tags: this.tags

package/build/bdd-framework/stepDefinitions/stepConfig.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.getStepConfig = getStepConfig;
 exports.isDecorator = isDecorator;
 exports.isPlaywrightStyle = isPlaywrightStyle;
-/**
- * Playwright-bdd's step config.
+/**
+ * Playwright-bdd's step config.
  */
 function getStepConfig(step) {
   return step.code.stepConfig;
@@ -15,9 +15,9 @@ function getStepConfig(step) {
 function isDecorator(stepConfig) {
   return Boolean(stepConfig === null || stepConfig === void 0 ? void 0 : stepConfig.pomNode);
 }
-/**
- * Cucumber-style steps don't have stepConfig
- * b/c they created directly via cucumber's Given, When, Then.
+/**
+ * Cucumber-style steps don't have stepConfig
+ * b/c they created directly via cucumber's Given, When, Then.
  */
 function isPlaywrightStyle(stepConfig) {
   return Boolean(stepConfig);

package/build/bdd-framework/utils/exit.js

@@ -5,24 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.exit = exit;
 exports.withExitHandler = withExitHandler;
-var _logger = require("./logger");
 var _worker_threads = require("worker_threads");
-/**
- * Exit utils.
- *
- * When calling process.exit() in worker thread used for file generation,
- * logs are not flushed (https://github.com/vitalets/playwright-bdd/issues/59).
- * That's why instead of process.exit we throw ExitError
- * that just sets process.exitCode = 1 and allow program to exit normally.
- *
- * On the other hand, when running in main thread, especially inside Playwright,
- * thrown error is captured by Playwright and show with additional messages (e.g. no tests found).
- * That's why in main thread we to call process.exit() to show only needed error.
- *
- * Relevant discussions:
- * - https://github.com/nodejs/node/issues/6379
- * - https://github.com/nodejs/node-v0.x-archive/issues/3737
- * - https://github.com/cucumber/cucumber-js/pull/123
+/**
+ * Exit utils.
+ *
+ * When calling process.exit() in worker thread used for test-file generation,
+ * logs are not flushed (https://github.com/vitalets/playwright-bdd/issues/59).
+ * That's why instead of process.exit we throw ExitError
+ * that just sets process.exitCode = 1 and allow program to exit normally.
+ * This esnured by wrapping code with withExitHandler().
+ *
+ * On the other hand, when running in the main thread, especially inside Playwright,
+ * thrown error is captured by Playwright and show with additional messages (e.g. no tests found).
+ * That's why in main thread we to call process.exit() to show only needed error.
+ *
+ * Relevant discussions:
+ * - https://github.com/nodejs/node/issues/6379
+ * - https://github.com/nodejs/node-v0.x-archive/issues/3737
+ * - https://github.com/cucumber/cucumber-js/pull/123
  */
 
 class ExitError extends Error {
@@ -35,6 +35,10 @@ async function withExitHandler(fn) {
     return await fn();
   } catch (e) {
     if (e instanceof ExitError) {
+      if (e.message) {
+        // eslint-disable-next-line no-console
+        console.error(e.message);
+      }
       process.exitCode = 1;
     } else {
       throw e;
@@ -44,8 +48,12 @@ async function withExitHandler(fn) {
 function exit(...messages) {
   messages = messages.filter(Boolean);
   if (_worker_threads.isMainThread) {
+    // use console.error() here instead of logger.error() to have less stack
+    // for flushing messages to stderr.
+
     if (messages.length) {
-      _logger.logger.error('Error:', ...messages);
+      // eslint-disable-next-line no-console, max-depth
+      console.error('Error:', ...messages);
     }
     process.exit(1);
   } else {

package/build/bdd-framework/utils/index.js

@@ -4,6 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.callWithTimeout = callWithTimeout;
+exports.extractTemplateParams = extractTemplateParams;
 exports.getPackageVersion = getPackageVersion;
 exports.getSymbolByName = getSymbolByName;
 exports.removeDuplicates = removeDuplicates;
@@ -11,7 +13,12 @@ exports.resolvePackageRoot = resolvePackageRoot;
 exports.template = template;
 var _fs = _interopRequireDefault(require("fs"));
 var _path = _interopRequireDefault(require("path"));
-// See: https://stackoverflow.com/questions/50453640/how-can-i-get-the-value-of-a-symbol-property
+var _util = require("util");
+const setTimeoutPromise = (0, _util.promisify)(setTimeout);
+/**
+ * Returns Symbol by name.
+ * See: https://stackoverflow.com/questions/50453640/how-can-i-get-the-value-of-a-symbol-property
+ */
 function getSymbolByName(target, name) {
   const ownKeys = Reflect.ownKeys(target);
   const symbol = ownKeys.find(key => key.toString() === `Symbol(${name})`);
@@ -20,15 +27,22 @@ function getSymbolByName(target, name) {
   }
   return symbol;
 }
-/**
- * Inserts params into template.
- * Params defined as <param>.
+/**
+ * Inserts params into template.
+ * Params defined as <param>.
  */
 function template(t, params = {}) {
   return t.replace(/<(.+?)>/g, (match, key) => {
     return params[key] !== undefined ? String(params[key]) : match;
   });
 }
+/**
+ * Extracts all template params from string.
+ * Params defined as <param>.
+ */
+function extractTemplateParams(t) {
+  return [...t.matchAll(/<(.+?)>/g)].map(m => m[1]);
+}
 function removeDuplicates(arr) {
   return [...new Set(arr)];
 }
@@ -41,4 +55,16 @@ function getPackageVersion(packageName) {
   const packageJsonPath = _path.default.join(packageRoot, 'package.json');
   const packageJson = JSON.parse(_fs.default.readFileSync(packageJsonPath, 'utf8'));
   return packageJson.version || '';
+}
+async function callWithTimeout(fn, timeout, timeoutMsg) {
+  if (!timeout) {
+    return fn();
+  }
+  const ac = new AbortController();
+  return Promise.race([fn(), setTimeoutPromise(timeout, null, {
+    ref: false,
+    signal: ac.signal
+  }).then(() => {
+    throw new Error(timeoutMsg || `Function timeout (${timeout} ms)`);
+  })]).finally(() => ac.abort());
 }

package/build/bdd-framework/utils/jsStringWrap.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.jsStringWrap = jsStringWrap;
-/**
- * Adopted version of https://github.com/joliss/js-string-escape
- * - added support of backticks
- * - added 'quotes' option to indicate which quotes to escape
- * - wrap result string with provided quotes
- *
- * Considered alternative is https://github.com/mathiasbynens/jsesc,
- * but it provides additional functionality and much slower
- * See: https://github.com/mathiasbynens/jsesc/issues/16
+/**
+ * Adopted version of https://github.com/joliss/js-string-escape
+ * - added support of backticks
+ * - added 'quotes' option to indicate which quotes to escape
+ * - wrap result string with provided quotes
+ *
+ * Considered alternative is https://github.com/mathiasbynens/jsesc,
+ * but it provides additional functionality and much slower
+ * See: https://github.com/mathiasbynens/jsesc/issues/16
  */
 function jsStringWrap(str, {
   quotes = 'single'

package/build/bdd-framework/utils/logger.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.logger = exports.Logger = void 0;
-/**
- * Simple logger
+/**
+ * Simple logger
  */
 class Logger {
   options;
@@ -13,7 +13,9 @@ class Logger {
     this.options = options;
   }
   log(...args) {
-    if (this.options.verbose) console.log(...args);
+    if (this.options.verbose) {
+      console.log(...args);
+    }
   }
   warn(...args) {
     // using log() to output warnings to stdout, not stderr

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

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = exports.default = {
+  addTags: [async ({
+    $tags
+  }, use, testInfo) => {
+    testInfo.annotations.push({
+      type: 'tags',
+      description: $tags.join(', ')
+    });
+    await use();
+  }, {
+    auto: true
+  }]
+};

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

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+const cacheMap = new Map();
+var _default = exports.default = {
+  // eslint-disable-next-line no-empty-pattern
+  cacheLayer: async ({}, use) => {
+    await use(cacheMap);
+  }
+};

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

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = exports.default = {
+  context: async ({
+    context
+  }, use) => {
+    // eslint-disable-next-line no-undef
+    await context.addInitScript(() => window.localStorage.setItem('isDnBannerHide', true));
+    await use(context);
+  }
+};

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

@@ -0,0 +1,26 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _page = _interopRequireDefault(require("./page"));
+var _context = _interopRequireDefault(require("./context"));
+var _cacheLayer = _interopRequireDefault(require("./cacheLayer"));
+var _addTags = _interopRequireDefault(require("./addTags"));
+function getBuiltInFixtures(bddMode) {
+  let builtInFixtures = {
+    ..._page.default,
+    ..._context.default,
+    ..._cacheLayer.default
+  };
+  if (bddMode) {
+    builtInFixtures = {
+      ...builtInFixtures,
+      ..._addTags.default
+    };
+  }
+  return builtInFixtures;
+}
+var _default = exports.default = getBuiltInFixtures;