codeceptjs 3.0.3-beta.7 → 3.0.5

package/docs/locators.md

@@ -21,7 +21,7 @@ If the locator is an object, it should have a single element, with the key signi
 
 Examples:
 
-* {permalink: /'foo'} matches `<div id="foo">`
+* {id: 'foo'} matches `<div id="foo">`
 * {name: 'foo'} matches `<div name="foo">`
 * {css: 'input[type=input][value=foo]'} matches `<input type="input" value="foo">`
 * {xpath: "//input[@type='submit'][contains(@value, 'foo')]"} matches `<input type="submit" value="foobar">`
@@ -229,7 +229,7 @@ locate('button').after('.btn-cancel');
 
 ID locators are best to select the exact semantic element in web and mobile testing:
 
-* `#user` or `{ permalink: /'user' }` finds element with id="user"
+* `#user` or `{ id: 'user' }` finds element with id="user"
 * `~user` finds element with accessibility id "user" (in Mobile testing) or with `aria-label=user`.
 
 ## Custom Locators

package/docs/mobile-react-native-locators.md

@@ -46,14 +46,14 @@ You could do it just by changing `automationName` in the `helpers` section of th
 ```
 Then you could locate components using XPath expression:
 ```js
-I.tap({android: /'//*[@view-tag="someButton"]', ios: '~someButton'})
+I.tap({android: '//*[@view-tag="someButton"]', ios: '~someButton'})
 ```
 This way test would work for both platforms without any changes in code.
 To simplify things further you could write a helper function:
 ```js
 function tid(id) {
   return {
-    android: /`//*[@view-tag="${id}"]`,
+    android: `//*[@view-tag="${id}"]`,
     ios: '~' + id
   }
 }

package/docs/mobile.md

@@ -19,7 +19,7 @@ I.see('davert@codecept.io', '~email of the customer'));
 I.clearField('~email of the customer'));
 I.dontSee('Nothing special', '~email of the customer'));
 I.seeElement({
-  android: /'android.widget.Button',
+  android: 'android.widget.Button',
   ios: '//UIAApplication[1]/UIAWindow[1]/UIAButton[1]'
 });
 ```
@@ -118,6 +118,7 @@ helpers: {
     app: "bs://<hashed app-id>",
     host: "hub-cloud.browserstack.com",
     port: 4444,
+    platform: "ios",
     user: "BROWSERSTACK_USER",
     key: "BROWSERSTACK_KEY",
     device: "iPhone 7"
@@ -262,7 +263,7 @@ It is often happen that mobile applications behave similarly on different platfo
 CodeceptJS provides a way to specify different locators for Android and iOS platforms:
 
 ```js
-I.click({android: /'//android.widget.Button', ios: '//UIAApplication[1]/UIAWindow[1]/UIAButton[1]'});
+I.click({android: '//android.widget.Button', ios: '//UIAApplication[1]/UIAWindow[1]/UIAButton[1]'});
 ```
 
 In case some code should be executed on one platform and ignored on others use `runOnAndroid` and `runOnIOS` methods:
@@ -293,4 +294,3 @@ Just as you can specify android, and ios-specific locators, you can do so for we
 ```js
 I.click({web: '#login', ios: '//UIAApplication[1]/UIAWindow[1]/UIAButton[1]'});
 ```
-

package/docs/pageobjects.md

@@ -32,7 +32,9 @@ const { I, myPage, mySteps } = inject();
 // inject objects for a test by name
 Scenario('sample test', ({ I, myPage, mySteps }) => {
   // ...
-  }
+});
+```
+
 ## Actor
 
 During initialization you were asked to create a custom steps file. If you accepted this option, you are now able to use the `custom_steps.js` file to extend `I`. See how the `login` method can be added to `I`:

package/docs/reports.md

@@ -360,9 +360,9 @@ Configure mocha-multi with reports that you want:
       "mocha-junit-reporter": {
         "stdout": "./output/console.log",
         "options": {
-          "mochaFile": "./output/result.xml"
-        },
-        "attachments": true //add screenshot for a failed test
+          "mochaFile": "./output/result.xml",
+          "attachments": true //add screenshot for a failed test
+        }
       }
     }
   }

package/docs/typescript.md

@@ -19,10 +19,10 @@ Example:
 
 ![Quick Info](/img/Quick_info.gif)
 
-- Checks types - thanks to TypeScript support in CodeceptJS now allow to tests your tests. TypeScript can prevent some errors: 
+- Checks types - thanks to TypeScript support in CodeceptJS now allow to tests your tests. TypeScript can prevent some errors:
   - invalid type of variables passed to function;
   - calls no-exist method from PageObject or `I` object;
-  - incorrectly used CodeceptJS features; 
+  - incorrectly used CodeceptJS features;
 
 
 ## Getting Started
@@ -106,7 +106,7 @@ declare namespace CodeceptJS {
 
 ## Types for custom helper or page object
 
-If you want to get types for your [custom helper](https://codecept.io/helpers/#configuration), you can add their automatically with CodeceptJS command `npx codeceptjs def`. 
+If you want to get types for your [custom helper](https://codecept.io/helpers/#configuration), you can add their automatically with CodeceptJS command `npx codeceptjs def`.
 
 For example, if you add the new step `printMessage` for your custom helper like this:
 ```js
@@ -121,9 +121,9 @@ export = CustomHelper
 ```
 
 Then you need to add this helper to your `codecept.conf.js` like in this [docs](https://codecept.io/helpers/#configuration).
-And then run the command `npx codeceptjs def`. 
+And then run the command `npx codeceptjs def`.
 
-As result our `steps.d.ts` file will be updated like this: 
+As result our `steps.d.ts` file will be updated like this:
 ```ts
 /// <reference types='codeceptjs' />
 type CustomHelper = import('./CustomHelper');
@@ -156,3 +156,45 @@ declare namespace CodeceptJS {
   }
 }
 ```
+
+## Types for custom strict locators
+
+You can define [custom strict locators](https://codecept.io/locators/#custom-strict-locators) that can be used in all methods taking a locator (parameter type `LocatorOrString`).
+
+Example: A custom strict locator with a `data` property, which can be used like this:
+
+```ts
+I.click({ data: 'user-login' });
+```
+
+In order to use the custom locator in TypeScript code, its type shape needs to be registered in the interface `CustomLocators` in your `steps.d.ts` file:
+
+```ts
+/// <reference types='codeceptjs' />
+...
+
+declare namespace CodeceptJS {
+  ...
+
+  interface CustomLocators {
+    data: { data: string };
+  }
+}
+```
+
+The property keys used in the `CustomLocators` interface do not matter (only the *types* of the interface properties are used). For simplicity it is recommended to use the name that is also used in your custom locator itself.
+
+You can also define more complicated custom locators with multiple (also optional) properties:
+
+```ts
+/// <reference types='codeceptjs' />
+...
+
+declare namespace CodeceptJS {
+  ...
+
+  interface CustomLocators {
+    data: { data: string, value?: number, flag?: boolean };
+  }
+}
+```

package/docs/webapi/fillField.mustache

@@ -12,4 +12,4 @@ I.fillField('form#login input[name=username]', 'John');
 I.fillField({css: 'form#login input[name=username]'}, 'John');
 ```
 @param {CodeceptJS.LocatorOrString} field located by label|name|CSS|XPath|strict locator.
-@param {string} value text value to fill.
+@param {CodeceptJS.StringOrSecret} value text value to fill.

package/lib/cli.js

@@ -3,6 +3,7 @@ const ms = require('ms');
 const event = require('./event');
 const AssertionFailedError = require('./assert/error');
 const output = require('./output');
+const { MetaStep } = require('./step');
 
 const cursor = Base.cursor;
 let currentMetaStep = [];
@@ -77,17 +78,22 @@ class Cli extends Base {
       });
 
       event.dispatcher.on(event.step.started, (step) => {
-        output.stepShift = 3;
-        const printMetaStep = (metaStep) => {
-          if (!metaStep) return currentMetaStep.shift();
-          if (currentMetaStep.indexOf(metaStep.toString()) >= 0) return; // step is the same
-          if (metaStep.metaStep) {
-            printMetaStep(metaStep.metaStep);
+        let processingStep = step;
+        const metaSteps = [];
+        while (processingStep.metaStep) {
+          metaSteps.unshift(processingStep.metaStep);
+          processingStep = processingStep.metaStep;
+        }
+        const shift = metaSteps.length;
+
+        for (let i = 0; i < Math.max(currentMetaStep.length, metaSteps.length); i++) {
+          if (currentMetaStep[i] !== metaSteps[i]) {
+            output.stepShift = 3 + 2 * i;
+            if (metaSteps[i]) output.step(metaSteps[i]);
           }
-          currentMetaStep.unshift(metaStep.toString());
-          output.step(metaStep);
-        };
-        printMetaStep(step.metaStep);
+        }
+        currentMetaStep = metaSteps;
+        output.stepShift = 3 + 2 * shift;
         output.step(step);
       });
 

package/lib/command/init.js

@@ -143,7 +143,7 @@ module.exports = function (initPath) {
       error(err);
     }
 
-    const finish = () => {
+    const finish = async () => {
       // create steps file by default
       const stepFile = './steps_file.js';
       fs.writeFileSync(path.join(testsPath, stepFile), defaultActor);
@@ -196,21 +196,29 @@ module.exports = function (initPath) {
         print(`Intellisense enabled in ${jsconfigFile}`);
       }
 
+      const generateDefinitionsManually = colors.bold(`To get auto-completion support, please generate type definitions: ${colors.green('npx codeceptjs def')}`);
+
       if (packages) {
         try {
           install(packages);
-          print(colors.green.bold(`Packages ${packages} installed successfully`));
-          print('To get autocompletion generate type definitions', colors.green('npx codeceptjs def'))
 
+          if (testsPath) {
+            print(generateDefinitionsManually);
+          } else {
+            const { code } = spawn.sync('npx', ['codeceptjs', 'def']);
+            if (code !== 0) {
+              print(generateDefinitionsManually);
+            }
+          }
         } catch (err) {
           print(colors.bold.red(err.toString()));
           print();
           print(colors.bold.red('Please install next packages manually:'));
-          print("npm i " + packages.join(' ') + ' --save-dev');
+          print(`npm i ${packages.join(' ')} --save-dev`);
           print();
           print('Things to do after missing packages installed:');
-          print('☑ Generate type definitions', colors.green('npx codeceptjs def'));
-          print('☑ Create first test', colors.green('npx codeceptjs gt'));
+          print('☑', generateDefinitionsManually);
+          print('☑ Create first test:', colors.green('npx codeceptjs gt'));
           print(colors.bold.magenta('Find more information at https://codecept.io'));
           return;
         }
@@ -259,7 +267,7 @@ function install(dependencies, verbose) {
 
   if (!fs.existsSync(path.join(process.cwd(), 'package.json'))) {
     dependencies.push('codeceptjs');
-    throw new Error("Error: 'package.json' file not found. Generate it with 'npm init -y' and re-install codeceptjs:");
+    throw new Error("Error: 'package.json' file not found. Generate it with 'npm init -y' command.");
   }
 
   if (!installedLocally()) {

package/lib/command/interactive.js

@@ -4,7 +4,7 @@ const Codecept = require('../codecept');
 const event = require('../event');
 const output = require('../output');
 
-module.exports = function (path, options) {
+module.exports = async function (path, options) {
   // Backward compatibility for --profile
   process.profile = options.profile;
   process.env.profile = options.profile;
@@ -14,11 +14,8 @@ module.exports = function (path, options) {
   const codecept = new Codecept(config, options);
   codecept.init(testsPath);
 
-  codecept.runBootstrap((err) => {
-    if (err) {
-      output.error(`Error while running bootstrap file :${err}`);
-      return;
-    }
+  try {
+    await codecept.bootstrap();
 
     if (options.verbose) output.level(3);
 
@@ -36,5 +33,7 @@ module.exports = function (path, options) {
     recorder.add(() => event.emit(event.suite.after, {}));
     recorder.add(() => event.emit(event.all.result, {}));
     recorder.add(() => codecept.teardown());
-  });
+  } catch (err) {
+    output.error(`Error while running bootstrap file :${err}`);
+  }
 };

package/lib/command/run.js

@@ -19,9 +19,9 @@ module.exports = async function (test, options) {
   createOutputDir(config, testRoot);
 
   const codecept = new Codecept(config, options);
-  codecept.init(testRoot);
 
   try {
+    codecept.init(testRoot);
     await codecept.bootstrap();
     codecept.loadTests();
     await codecept.run(test);

package/lib/config.js

@@ -77,7 +77,12 @@ class Config {
       return loadConfigFile(jsonConfig);
     }
 
-    throw new Error(`Can not load config from ${jsConfig} or ${jsonConfig}\nCodeceptJS is not initialized in this dir. Execute 'codeceptjs init' to start`);
+    const tsConfig = path.join(configFile, 'codecept.conf.ts');
+    if (isFile(tsConfig)) {
+      return loadConfigFile(tsConfig);
+    }
+
+    throw new Error(`Can not load config from ${jsConfig} or ${jsonConfig} or ${tsConfig}\nCodeceptJS is not initialized in this dir. Execute 'codeceptjs init' to start`);
   }
 
   /**

package/lib/container.js

@@ -171,7 +171,7 @@ function createHelpers(config) {
           if (require('./utils').installedLocally()) {
             install = `npm install --save-dev ${requirements.join(' ')}`;
           } else {
-            console.log("WARNING: CodeceptJS is not installed locally. It is recommended to switch to local installation");
+            console.log('WARNING: CodeceptJS is not installed locally. It is recommended to switch to local installation');
             install = `[sudo] npm install -g ${requirements.join(' ')}`;
           }
           throw new Error(`Required modules are not installed.\n\nRUN: ${install}`);

package/lib/helper/Nightmare.js

@@ -803,7 +803,7 @@ class Nightmare extends Helper {
   }
 
   /**
-   * {{> grabValueFrom }}
+   * {{> grabValueFromAll }}
    */
   async grabValueFromAll(locator) {
     locator = new Locator(locator, 'css');

package/lib/helper/Playwright.js

@@ -488,7 +488,7 @@ class Playwright extends Helper {
     this.page = page;
     if (!page) return;
     page.setDefaultNavigationTimeout(this.options.getPageTimeout);
-    this.context = await this.page.$('body');
+    this.context = await this.page;
     if (this.config.browser === 'chrome') {
       await page.bringToFront();
     }
@@ -617,7 +617,7 @@ class Playwright extends Helper {
 
   async _withinEnd() {
     this.withinLocator = null;
-    this.context = await this.page.mainFrame().$('body');
+    this.context = await this.page;
   }
 
   _extractDataFromPerformanceTiming(timing, ...dataNames) {
@@ -800,11 +800,7 @@ class Playwright extends Helper {
   }
 
   /**
-   * Checks that title is equal to provided one.
-   *
-   * ```js
-   * I.seeTitleEquals('Test title.');
-   * ```
+   * {{> seeTitleEquals }}
    */
   async seeTitleEquals(text) {
     const title = await this.page.title();
@@ -1069,14 +1065,7 @@ class Playwright extends Helper {
   }
 
   /**
-   *
-   * Force clicks an element without waiting for it to become visible and not animating.
-   *
-   * ```js
-   * I.forceClick('#hiddenButton');
-   * I.forceClick('Click me', '#hidden');
-   * ```
-   *
+   * {{> forceClick }}
    */
   async forceClick(locator, context = null) {
     return proceedClick.call(this, locator, context, { force: true });
@@ -1500,6 +1489,10 @@ class Playwright extends Helper {
    * I.executeScript(([x, y]) => x + y, [x, y]);
    * ```
    * If a function returns a Promise it will wait for its resolution.
+   *
+   * @param {string|function} fn function to be executed in browser context.
+   * @param {any} [arg] optional argument to pass to the function
+   * @return {Promise<any>}
    */
   async executeScript(fn, arg) {
     let context = this.page;
@@ -1590,8 +1583,7 @@ class Playwright extends Helper {
   async grabCssPropertyFromAll(locator, cssProperty) {
     const els = await this._locate(locator);
     this.debug(`Matched ${els.length} elements`);
-    const res = await Promise.all(els.map(el => el.$eval('xpath=.', el => JSON.parse(JSON.stringify(getComputedStyle(el))), el)));
-    const cssValues = res.map(props => props[toCamelCase(cssProperty)]);
+    const cssValues = await Promise.all(els.map(el => el.$eval('xpath=.', (el, cssProperty) => getComputedStyle(el).getPropertyValue(cssProperty), cssProperty)));
 
     return cssValues;
   }
@@ -1771,9 +1763,21 @@ class Playwright extends Helper {
   async waitForEnabled(locator, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout;
     locator = new Locator(locator, 'css');
+    const matcher = await this.context;
+    let waiter;
     const context = await this._getContext();
-    // playwright combined selectors
-    const waiter = context.waitForSelector(`${buildLocatorString(locator)} >> __disabled=false`, { timeout: waitTimeout });
+    if (!locator.isXPath()) {
+      const valueFn = function ([locator]) {
+        return Array.from(document.querySelectorAll(locator)).filter(el => !el.disabled).length > 0;
+      };
+      waiter = context.waitForFunction(valueFn, [locator.value], { timeout: waitTimeout });
+    } else {
+      const enabledFn = function ([locator, $XPath]) {
+        eval($XPath); // eslint-disable-line no-eval
+        return $XPath(null, locator).filter(el => !el.disabled).length > 0;
+      };
+      waiter = context.waitForFunction(enabledFn, [locator.value, $XPath.toString()], { timeout: waitTimeout });
+    }
     return waiter.catch((err) => {
       throw new Error(`element (${locator.toString()}) still not enabled after ${waitTimeout / 1000} sec\n${err.message}`);
     });
@@ -1785,9 +1789,21 @@ class Playwright extends Helper {
   async waitForValue(field, value, sec) {
     const waitTimeout = sec ? sec * 1000 : this.options.waitForTimeout;
     const locator = new Locator(field, 'css');
+    const matcher = await this.context;
+    let waiter;
     const context = await this._getContext();
-    // uses a custom selector engine for finding value properties on elements
-    const waiter = context.waitForSelector(`${buildLocatorString(locator)} >> __value=${value}`, { timeout: waitTimeout, state: 'visible' });
+    if (!locator.isXPath()) {
+      const valueFn = function ([locator, value]) {
+        return Array.from(document.querySelectorAll(locator)).filter(el => (el.value || '').indexOf(value) !== -1).length > 0;
+      };
+      waiter = context.waitForFunction(valueFn, [locator.value, value], { timeout: waitTimeout });
+    } else {
+      const valueFn = function ([locator, $XPath, value]) {
+        eval($XPath); // eslint-disable-line no-eval
+        return $XPath(null, locator).filter(el => (el.value || '').indexOf(value) !== -1).length > 0;
+      };
+      waiter = context.waitForFunction(valueFn, [locator.value, $XPath.toString(), value], { timeout: waitTimeout });
+    }
     return waiter.catch((err) => {
       const loc = locator.toString();
       throw new Error(`element (${loc}) is not in DOM or there is no element(${loc}) with value "${value}" after ${waitTimeout / 1000} sec\n${err.message}`);
@@ -2023,7 +2039,7 @@ class Playwright extends Helper {
       return;
     }
     if (!locator) {
-      this.context = await this.page.mainFrame().$('body');
+      this.context = this.page;
       return;
     }
 
@@ -2059,7 +2075,7 @@ class Playwright extends Helper {
   /**
    * Waits for navigation to finish. By default takes configured `waitForNavigation` option.
    *
-   * See [Pupeteer's reference](https://github.com/microsoft/Playwright/blob/master/docs/api.md#pagewaitfornavigationoptions)
+   * See [Playwright's reference](https://playwright.dev/docs/api/class-page?_highlight=waitfornavi#pagewaitfornavigationoptions)
    *
    * @param {*} opts
    */
@@ -2433,7 +2449,7 @@ async function targetCreatedHandler(page) {
         }
         // if context element was in iframe - keep it
         // if (await this.context.ownerFrame()) return;
-        this.context = context;
+        this.context = page;
       });
   });
   page.on('console', (msg) => {

package/lib/helper/REST.js

@@ -1,4 +1,5 @@
 const axios = require('axios').default;
+const Secret = require('../secret');
 
 const Helper = require('../helper');
 
@@ -75,12 +76,18 @@ class REST extends Helper {
    * @param {*} request
    */
   async _executeRequest(request) {
+    const _debugRequest = { ...request };
     axios.defaults.timeout = request.timeout || this.options.timeout;
 
     if (this.headers && this.headers.auth) {
       request.auth = this.headers.auth;
     }
 
+    if (request.data instanceof Secret) {
+      _debugRequest.data = '*****';
+      request.data = typeof request.data === 'object' ? { ...request.data.toString() } : request.data.toString();
+    }
+
     if ((typeof request.data) === 'string') {
       if (!request.headers || !request.headers['Content-Type']) {
         request.headers = { ...request.headers, ...{ 'Content-Type': 'application/x-www-form-urlencoded' } };
@@ -91,7 +98,7 @@ class REST extends Helper {
       await this.config.onRequest(request);
     }
 
-    this.debugSection('Request', JSON.stringify(request));
+    this.debugSection('Request', JSON.stringify(_debugRequest));
 
     let response;
     try {
@@ -149,6 +156,10 @@ class REST extends Helper {
    *
    * ```js
    * I.sendPostRequest('/api/users.json', { "email": "user@user.com" });
+   *
+   * // To mask the payload in logs
+   * I.sendPostRequest('/api/users.json', secret({ "email": "user@user.com" }));
+   *
    * ```
    *
    * @param {*} url
@@ -176,6 +187,10 @@ class REST extends Helper {
    *
    * ```js
    * I.sendPatchRequest('/api/users.json', { "email": "user@user.com" });
+   *
+   * // To mask the payload in logs
+   * I.sendPatchRequest('/api/users.json', secret({ "email": "user@user.com" }));
+   *
    * ```
    *
    * @param {string} url
@@ -203,6 +218,10 @@ class REST extends Helper {
    *
    * ```js
    * I.sendPutRequest('/api/users.json', { "email": "user@user.com" });
+   *
+   * // To mask the payload in logs
+   * I.sendPutRequest('/api/users.json', secret({ "email": "user@user.com" }));
+   *
    * ```
    *
    * @param {string} url

package/lib/helper/WebDriver.js

@@ -718,7 +718,7 @@ class WebDriver extends Helper {
    * @param {object} locator
    */
   async _smartWait(locator) {
-    this.debugSection(`SmartWait (${this.options.smartWait}ms)`, `Locating ${locator} in ${this.options.smartWait}`);
+    this.debugSection(`SmartWait (${this.options.smartWait}ms)`, `Locating ${JSON.stringify(locator)} in ${this.options.smartWait}`);
     await this.defineTimeout({ implicit: this.options.smartWait });
   }
 
@@ -1370,7 +1370,7 @@ class WebDriver extends Helper {
    */
   async grabBrowserLogs() {
     if (this.browser.isW3C) {
-      this.debug('Logs not awailable in W3C specification');
+      this.debug('Logs not available in W3C specification');
       return;
     }
     return this.browser.getLogs('browser');

package/lib/interfaces/gherkin.js

@@ -28,11 +28,16 @@ module.exports = (text) => {
 
   const runSteps = async (steps) => {
     for (const step of steps) {
-      event.emit(event.bddStep.before, step);
       const metaStep = new Step.MetaStep(null, step.text);
       metaStep.actor = step.keyword.trim();
       const setMetaStep = (step) => {
-        if (step.metaStep) step = step.metaStep; // assign metastep to metastep for nested steps
+        if (step.metaStep) {
+          if (step.metaStep === metaStep) {
+            return;
+          }
+          setMetaStep(step.metaStep);
+          return;
+        }
         step.metaStep = metaStep;
       };
       const fn = matchStep(step.text);
@@ -44,10 +49,19 @@ module.exports = (text) => {
         if (step.argument.type === 'DataTable') metaStep.comment = `\n${transformTable(step.argument)}`;
         if (step.argument.content) metaStep.comment = `\n${step.argument.content}`;
       }
-      event.dispatcher.on(event.step.before, setMetaStep);
+      step.startTime = Date.now();
+      step.match = fn.line;
+      event.emit(event.bddStep.before, step);
+      event.dispatcher.prependListener(event.step.before, setMetaStep);
       try {
         await fn(...fn.params);
+        step.status = 'passed';
+      } catch (err) {
+        step.status = 'failed';
+        step.err = err;
+        throw err;
       } finally {
+        step.endTime = Date.now();
         event.dispatcher.removeListener(event.step.before, setMetaStep);
       }
       event.emit(event.bddStep.after, step);

package/lib/output.js

@@ -102,14 +102,14 @@ module.exports = {
     if (!step) return;
     // Avoid to print non-gherkin steps, when gherkin is running for --steps mode
     if (outputLevel === 1) {
-      if (!step.isMetaStep() && step.hasBDDAncestor()) {
+      if (step.hasBDDAncestor()) {
         return;
       }
     }
 
     let stepLine = step.toString();
     if (step.metaStep && outputLevel >= 1) {
-      this.stepShift += 2;
+      // this.stepShift += 2;
       stepLine = colors.green(truncate(stepLine, this.spaceShift));
     }
     if (step.comment) {

package/lib/plugin/allure.js

@@ -261,13 +261,9 @@ module.exports = (config) => {
     if (isHookSteps === false) {
       startMetaStep(step.metaStep);
       if (currentStep !== step) {
-        // The reason we need to do this cause
-        // the step actor contains this and hence
-        // the allure reporter could not parse and
-        // generate the report
-        if (step.actor.includes('\u001b[36m')) {
-          step.actor = step.actor.replace('\u001b[36m', '').replace('\u001b[39m', '');
-        }
+        // In multi-session scenarios, actors' names will be highlighted with ANSI
+        // escape sequences which are invalid XML values
+        step.actor = step.actor.replace(ansiRegExp(), '');
         reporter.startStep(step.toString());
         currentStep = step;
       }