codeceptjs 3.3.5 → 3.3.7-beta.1

package/docs/webapi/waitForInvisible.mustache

@@ -7,4 +7,4 @@ I.waitForInvisible('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-[!] returns a _promise_ which is synchronized internally by recorder
+⚠️ returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForText.mustache

@@ -10,4 +10,4 @@ I.waitForText('Thank you, form has been submitted', 5, '#modal');
 @param {string }text to wait for.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
 @param {CodeceptJS.LocatorOrString} [context] (optional) element located by CSS|XPath|strict locator.
-[!] returns a _promise_ which is synchronized internally by recorder
+⚠️ returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForValue.mustache

@@ -7,4 +7,4 @@ I.waitForValue('//input', "GoodValue");
 @param {LocatorOrString} field input field.
 @param {string }value expected value.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-[!] returns a _promise_ which is synchronized internally by recorder
+⚠️ returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitForVisible.mustache

@@ -7,4 +7,4 @@ I.waitForVisible('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-[!] returns a _promise_ which is synchronized internally by recorder
+⚠️ returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitInUrl.mustache

@@ -6,4 +6,4 @@ I.waitInUrl('/info', 2);
 
 @param {string} urlPart value to check.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-[!] returns a _promise_ which is synchronized internally by recorder
+⚠️ returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitNumberOfVisibleElements.mustache

@@ -7,4 +7,4 @@ I.waitNumberOfVisibleElements('a', 3);
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} num number of elements.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-[!] returns a _promise_ which is synchronized internally by recorder
+⚠️ returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitToHide.mustache

@@ -7,4 +7,4 @@ I.waitToHide('#popup');
 
 @param {CodeceptJS.LocatorOrString} locator element located by CSS|XPath|strict locator.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-[!] returns a _promise_ which is synchronized internally by recorder
+⚠️ returns a _promise_ which is synchronized internally by recorder

package/docs/webapi/waitUrlEquals.mustache

@@ -7,4 +7,4 @@ I.waitUrlEquals('http://127.0.0.1:8000/info');
 
 @param {string} urlPart value to check.
 @param {number} [sec=1] (optional, `1` by default) time in seconds to wait
-[!] returns a _promise_ which is synchronized internally by recorder
+⚠️ returns a _promise_ which is synchronized internally by recorder

package/lib/command/configMigrate.js

@@ -50,7 +50,7 @@ module.exports = function (initPath) {
   },
   ]).then((result) => {
     if (result.configFile) {
-      const jsonConfigFile = path.join(testsPath, 'codecept.json');
+      const jsonConfigFile = path.join(testsPath, 'codecept.js');
       const config = JSON.parse(fs.readFileSync(jsonConfigFile, 'utf8'));
       config.name = testsPath.split(path.sep).pop();
 

package/lib/command/dryRun.js

@@ -27,7 +27,7 @@ module.exports = async function (test, options) {
     codecept = new Codecept(config, options);
     codecept.init(testRoot);
 
-    if (options.bootstrap) await codecept.runBootstrap();
+    if (options.bootstrap) await codecept.bootstrap();
 
     codecept.loadTests();
     store.dryRun = true;
@@ -71,6 +71,7 @@ function printTests(files) {
   output.print('');
   output.success(`  Total: ${numOfSuites} suites | ${numOfTests} tests  `);
   printFooter();
+  process.exit(0);
 }
 
 function printFooter() {

package/lib/command/generate.js

@@ -3,13 +3,16 @@ const fs = require('fs');
 const inquirer = require('inquirer');
 const mkdirp = require('mkdirp');
 const path = require('path');
-
-const { fileExists, ucfirst, lcfirst } = require('../utils');
+const {
+  fileExists, ucfirst, lcfirst, beautify,
+} = require('../utils');
 const output = require('../output');
 const {
-  getConfig, getTestRoot, safeFileWrite,
+  getConfig, getTestRoot, safeFileWrite, readConfig,
 } = require('./utils');
 
+let extension = 'js';
+
 const testTemplate = `Feature('{{feature}}');
 
 Scenario('test something', ({ {{actor}} }) => {
@@ -26,7 +29,7 @@ module.exports.test = function (genPath) {
   output.print('Creating a new test...');
   output.print('----------------------');
 
-  const defaultExt = config.tests.match(/([^\*/]*?)$/)[1] || '_test.js';
+  const defaultExt = config.tests.match(/([^\*/]*?)$/)[1] || `_test.${extension}`;
 
   return inquirer.prompt([
     {
@@ -79,25 +82,34 @@ module.exports.pageObject = function (genPath, opts) {
   const kind = opts.T || 'page';
   if (!config) return;
 
+  let configFile = path.join(testsPath, `codecept.conf.${extension}`);
+
+  if (!fileExists(configFile)) {
+    extension = 'ts';
+    configFile = path.join(testsPath, `codecept.conf.${extension}`);
+  }
   output.print(`Creating a new ${kind} object`);
   output.print('--------------------------');
 
-  return inquirer.prompt([{
-    type: 'input',
-    name: 'name',
-    message: `Name of a ${kind} object`,
-    validate: (val) => !!val,
-  }, {
-    type: 'input',
-    name: 'filename',
-    message: 'Where should it be stored',
-    default: answers => `./${kind}s/${answers.name}.js`,
-  }]).then((result) => {
+  return inquirer.prompt([
+    {
+      type: 'input',
+      name: 'name',
+      message: `Name of a ${kind} object`,
+      validate: (val) => !!val,
+    },
+    {
+      type: 'input',
+      name: 'filename',
+      message: 'Where should it be stored',
+      default: answers => `./${kind}s/${answers.name}.${extension}`,
+    }]).then((result) => {
     const pageObjectFile = path.join(testsPath, result.filename);
     const dir = path.dirname(pageObjectFile);
     if (!fileExists(dir)) fs.mkdirSync(dir);
 
     let actor = 'actor';
+
     if (config.include.I) {
       let actorPath = config.include.I;
       if (actorPath.charAt(0) === '.') { // relative path
@@ -107,16 +119,21 @@ module.exports.pageObject = function (genPath, opts) {
     }
     if (!safeFileWrite(pageObjectFile, pageObjectTemplate.replace('{{actor}}', actor))) return;
     const name = lcfirst(result.name) + ucfirst(kind);
+    let data = readConfig(configFile);
     config.include[name] = result.filename;
+    data = data.replace(/include[\s\S][^\}]*/i, `include: ${JSON.stringify(config.include).slice(0, -1)}`);
+
+    fs.writeFileSync(configFile, beautify(data), 'utf-8');
 
     output.success(`${ucfirst(kind)} object for ${result.name} was created in ${pageObjectFile}`);
-    output.print(`Update your config file (${colors.cyan('include')} section):
+    output.print(`Your config file (${colors.cyan('include')} section) has included the new created PO:
 
     include: {
+    ...
       ${name}: '${result.filename}',
     },`);
 
-    output.print(`Use ${output.colors.bold(name)} as parameter in test scenarios to access this object`);
+    output.print(`Use ${output.colors.bold(colors.cyan(name))} as parameter in test scenarios to access this object`);
   });
 };
 
@@ -163,7 +180,7 @@ module.exports.helper = function (genPath) {
     type: 'input',
     name: 'filename',
     message: 'Where should it be stored',
-    default: answers => `./${answers.name.toLowerCase()}_helper.js`,
+    default: answers => `./${answers.name.toLowerCase()}_helper.${extension}`,
   }]).then((result) => {
     const name = ucfirst(result.name);
     const helperFile = path.join(testsPath, result.filename);

package/lib/command/run-rerun.js

@@ -0,0 +1,38 @@
+const { getConfig, getTestRoot } = require('./utils');
+const { printError, createOutputDir } = require('./utils');
+const Config = require('../config');
+const Codecept = require('../rerun');
+
+module.exports = async function (test, options) {
+  // registering options globally to use in config
+  // Backward compatibility for --profile
+  process.profile = options.profile;
+  process.env.profile = options.profile;
+  const configFile = options.config;
+
+  let config = getConfig(configFile);
+  if (options.override) {
+    config = Config.append(JSON.parse(options.override));
+  }
+  const testRoot = getTestRoot(configFile);
+  createOutputDir(config, testRoot);
+
+  function processError(err) {
+    printError(err);
+    process.exit(1);
+  }
+  const codecept = new Codecept(config, options);
+
+  try {
+    codecept.init(testRoot);
+
+    await codecept.bootstrap();
+    codecept.loadTests(test);
+    await codecept.run();
+  } catch (err) {
+    printError(err);
+    process.exitCode = 1;
+  } finally {
+    await codecept.teardown();
+  }
+};

package/lib/command/utils.js

@@ -18,6 +18,15 @@ module.exports.getConfig = function (configFile) {
   }
 };
 
+module.exports.readConfig = function (configFile) {
+  try {
+    const data = fs.readFileSync(configFile, 'utf8');
+    return data;
+  } catch (err) {
+    output.error(err);
+  }
+};
+
 function getTestRoot(currentPath) {
   if (!currentPath) currentPath = '.';
   if (!path.isAbsolute(currentPath)) currentPath = path.join(process.cwd(), currentPath);
@@ -33,11 +42,12 @@ function fail(msg) {
 
 module.exports.fail = fail;
 
-function updateConfig(testsPath, config, key) {
-  const configFile = path.join(testsPath, 'codecept.conf.js');
+function updateConfig(testsPath, config, key, extension = 'js') {
+  const configFile = path.join(testsPath, `codecept.conf.${extension}`);
   if (!fileExists(configFile)) {
     console.log();
-    console.log(`${output.colors.bold.red('codecept.conf.js config can\'t be updated automatically')}`);
+    const msg = `codecept.conf.${extension} config can\'t be updated automatically`;
+    console.log(`${output.colors.bold.red(msg)}`);
     console.log('Please update it manually:');
     console.log();
     console.log(`${key}: ${config[key]}`);

package/lib/config.js

@@ -41,7 +41,7 @@ let config = {};
 const configFileNames = [
   'codecept.config.js',
   'codecept.conf.js',
-  'codecept.json',
+  'codecept.js',
   'codecept.config.ts',
   'codecept.conf.ts',
 ];
@@ -69,7 +69,7 @@ class Config {
    * If directory provided:
    * * try to load `codecept.config.js` from it
    * * try to load `codecept.conf.js` from it
-   * * try to load `codecept.json` from it
+   * * try to load `codecept.js` from it
    * If none of above: fail.
    *
    * @param {string} configFile

package/lib/data/context.js

@@ -1,6 +1,7 @@
 const { isGenerator } = require('../utils');
 const DataTable = require('./table');
 const DataScenarioConfig = require('./dataScenarioConfig');
+const Secret = require('../secret');
 
 module.exports = function (context) {
   context.Data = function (dataTable) {
@@ -70,6 +71,12 @@ function replaceTitle(title, dataRow) {
   // it should be printed
   if (Object.prototype.toString.call(dataRow.data) === (Object()).toString()
     && dataRow.data.toString() !== (Object()).toString()) {
+    Object.entries(dataRow.data).forEach(entry => {
+      const [key, value] = entry;
+      if (value instanceof Secret) {
+        dataRow.data[key] = value.getMasked();
+      }
+    });
     return `${title} | ${dataRow.data}`;
   }
 

package/lib/helper/Appium.js

@@ -34,7 +34,7 @@ const webRoot = 'body';
  *
  * ## Helper configuration
  *
- * This helper should be configured in codecept.json or codecept.conf.js
+ * This helper should be configured in codecept.conf.ts or codecept.conf.js
  *
  * * `app`: Application path. Local path or remote URL to an .ipa or .apk file, or a .zip containing one of these. Alias to desiredCapabilities.appPackage
  * * `host`: (default: 'localhost') Appium host
@@ -788,9 +788,11 @@ class Appium extends Webdriver {
    * I.startActivity('io.selendroid.testapp', '.RegisterUserActivity');
    * ```
    *
-   * @return {Promise<void>}
-   *
    * Appium: support only Android
+   *
+   * @param {string} appPackage
+   * @param {string} appActivity
+   * @return {Promise<void>}
    */
   async startActivity(appPackage, appActivity) {
     onlyForApps.call(this, 'Android');
@@ -1458,7 +1460,7 @@ class Appium extends Webdriver {
   }
 
   /**
-   * Saves a screenshot to ouput folder (set in codecept.json or codecept.conf.js).
+   * Saves a screenshot to ouput folder (set in codecept.conf.ts or codecept.conf.js).
    * Filename is relative to output folder.
    *
    * ```js

package/lib/helper/FileSystem.js

@@ -13,7 +13,7 @@ const { fileEquals } = require('../assert/equal');
  *
  * ```js
  * I.amInPath('test');
- * I.seeFile('codecept.json');
+ * I.seeFile('codecept.js');
  * I.seeInThisFile('FileSystem');
  * I.dontSeeInThisFile("WebDriver");
  * ```

package/lib/helper/Nightmare.js

@@ -35,7 +35,7 @@ let withinStatus = false;
  *
  * ## Configuration
  *
- * This helper should be configured in codecept.json or codecept.conf.js
+ * This helper should be configured in codecept.conf.ts or codecept.conf.js
  *
  * * `url` - base url of website to be tested
  * * `restart` (optional, default: true) - restart browser between tests.

package/lib/helper/Playwright.js

@@ -62,13 +62,14 @@ const { createValueEngine, createDisabledEngine } = require('./extras/Playwright
  * @prop {boolean} [disableScreenshots=false] - don't save screenshot on failure.
  * @prop {any} [emulate] - browser in device emulation mode.
  * @prop {boolean} [video=false] - enables video recording for failed tests; videos are saved into `output/videos` folder
+ * @prop {boolean} [keepVideoForPassedTests=false] - save videos for passed tests; videos are saved into `output/videos` folder
  * @prop {boolean} [trace=false] - record [tracing information](https://playwright.dev/docs/trace-viewer) with screenshots and snapshots.
  * @prop {boolean} [fullPageScreenshots=false] - make full page screenshots on failure.
  * @prop {boolean} [uniqueScreenshotNames=false] - option to prevent screenshot override if you have scenarios with the same name in different suites.
  * @prop {boolean} [keepBrowserState=false] - keep browser state between tests when `restart` is set to 'session'.
  * @prop {boolean} [keepCookies=false] - keep cookies between tests when `restart` is set to 'session'.
  * @prop {number} [waitForAction] - how long to wait after click, doubleClick or PressKey actions in ms. Default: 100.
- * @prop {number} [waitForNavigation] - When to consider navigation succeeded. Possible options: `load`, `domcontentloaded`, `networkidle`. Choose one of those options is possible. See [Playwright API](https://github.com/microsoft/playwright/blob/main/docs/api.md#pagewaitfornavigationoptions).
+ * @prop {string} [waitForNavigation] - When to consider navigation succeeded. Possible options: `load`, `domcontentloaded`, `networkidle`. Choose one of those options is possible. See [Playwright API](https://playwright.dev/docs/api/class-page#page-wait-for-navigation).
  * @prop {number} [pressKeyDelay=10] - Delay between key presses in ms. Used when calling Playwrights page.type(...) in fillField/appendField
  * @prop {number} [getPageTimeout] - config option to set maximum navigation time in milliseconds.
  * @prop {number} [waitForTimeout] - default wait* timeout in ms. Default: 1000.
@@ -476,6 +477,8 @@ class Playwright extends Helper {
 
     // close other sessions
     try {
+      if (!this.browser.contexts) return this.browser;
+
       const contexts = await this.browser.contexts();
       const currentContext = contexts[0];
       if (currentContext && (this.options.keepCookies || this.options.keepBrowserState)) {
@@ -548,22 +551,22 @@ class Playwright extends Helper {
   }
 
   /**
-  * Use Playwright API inside a test.
-  *
-  * First argument is a description of an action.
-  * Second argument is async function that gets this helper as parameter.
-  *
-  * { [`page`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-page.md), [`browserContext`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browsercontext.md) [`browser`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browser.md) } objects from Playwright API are available.
-  *
-  * ```js
-  * I.usePlaywrightTo('emulate offline mode', async ({ browserContext }) => {
-  *   await browserContext.setOffline(true);
-  * });
-  * ```
-  *
-  * @param {string} description used to show in logs.
-  * @param {function} fn async function that executed with Playwright helper as argumen
-  */
+   * Use Playwright API inside a test.
+   *
+   * First argument is a description of an action.
+   * Second argument is async function that gets this helper as parameter.
+   *
+   * { [`page`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-page.md), [`browserContext`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browsercontext.md) [`browser`](https://github.com/microsoft/playwright/blob/main/docs/src/api/class-browser.md) } objects from Playwright API are available.
+   *
+   * ```js
+   * I.usePlaywrightTo('emulate offline mode', async ({ browserContext }) => {
+   *   await browserContext.setOffline(true);
+   * });
+   * ```
+   *
+   * @param {string} description used to show in logs.
+   * @param {function} fn async function that executed with Playwright helper as argumen
+   */
   usePlaywrightTo(description, fn) {
     return this._useTo(...arguments);
   }
@@ -2029,7 +2032,11 @@ class Playwright extends Helper {
     }
 
     if (this.options.recordVideo && this.page && this.page.video()) {
+      const videoPath = `${global.output_dir}/videos/${clearString(test.title)}.failed.webm`;
       test.artifacts.video = await this.page.video().path();
+      fs.rename(test.artifacts.video, videoPath, (() => {
+        test.artifacts.video = videoPath;
+      }));
     }
 
     if (this.options.trace) {
@@ -2041,8 +2048,13 @@ class Playwright extends Helper {
 
   async _passed(test) {
     if (this.options.recordVideo && this.page && this.page.video()) {
+      const videoPath = `${global.output_dir}/videos/${clearString(test.title)}.passed.webm`;
+
       if (this.options.keepVideoForPassedTests) {
         test.artifacts.video = await this.page.video().path();
+        fs.rename(test.artifacts.video, videoPath, (() => {
+          test.artifacts.video = videoPath;
+        }));
       } else {
         this.page.video().delete().catch(e => {});
       }
@@ -2456,32 +2468,32 @@ class Playwright extends Helper {
   }
 
   /**
-  * Mocks network request using [`browserContext.route`](https://playwright.dev/docs/api/class-browsercontext#browser-context-route) of Playwright
-  *
-  * ```js
-  * I.mockRoute(/(\.png$)|(\.jpg$)/, route => route.abort());
-  * ```
-  * This method allows intercepting and mocking requests & responses. [Learn more about it](https://playwright.dev/docs/network#handle-requests)
-  *
-  * @param {string|RegExp} [url] URL, regex or pattern for to match URL
-  * @param {function} [handler] a function to process reques
-  */
+   * Mocks network request using [`browserContext.route`](https://playwright.dev/docs/api/class-browsercontext#browser-context-route) of Playwright
+   *
+   * ```js
+   * I.mockRoute(/(\.png$)|(\.jpg$)/, route => route.abort());
+   * ```
+   * This method allows intercepting and mocking requests & responses. [Learn more about it](https://playwright.dev/docs/network#handle-requests)
+   *
+   * @param {string|RegExp} [url] URL, regex or pattern for to match URL
+   * @param {function} [handler] a function to process reques
+   */
   async mockRoute(url, handler) {
     return this.browserContext.route(...arguments);
   }
 
   /**
-  * Stops network mocking created by `mockRoute`.
-  *
-  * ```js
-  * I.stopMockingRoute(/(\.png$)|(\.jpg$)/);
-  * I.stopMockingRoute(/(\.png$)|(\.jpg$)/, previouslySetHandler);
-  * ```
-  * If no handler is passed, all mock requests for the rote are disabled.
-  *
-  * @param {string|RegExp} [url] URL, regex or pattern for to match URL
-  * @param {function} [handler] a function to process reques
-  */
+   * Stops network mocking created by `mockRoute`.
+   *
+   * ```js
+   * I.stopMockingRoute(/(\.png$)|(\.jpg$)/);
+   * I.stopMockingRoute(/(\.png$)|(\.jpg$)/, previouslySetHandler);
+   * ```
+   * If no handler is passed, all mock requests for the rote are disabled.
+   *
+   * @param {string|RegExp} [url] URL, regex or pattern for to match URL
+   * @param {function} [handler] a function to process reques
+   */
   async stopMockingRoute(url, handler) {
     return this.browserContext.unroute(...arguments);
   }

package/lib/helper/Protractor.js

@@ -36,7 +36,7 @@ let Runner;
  *
  * ### Configuration
  *
- * This helper should be configured in codecept.json or codecept.conf.js
+ * This helper should be configured in codecept.conf.ts or codecept.conf.js
  *
  * * `url` - base url of website to be tested
  * * `browser` - browser in which perform testing

package/lib/helper/REST.js

@@ -9,7 +9,7 @@ const { beautify } = require('../utils');
  *
  * @typedef RESTConfig
  * @type {object}
- * @prop {string} endpoint - API base URL
+ * @prop {string} [endpoint] - API base URL
  * @prop {boolean} [prettyPrintJson=false] - pretty print json for response/request on console logs
  * @prop {number} [timeout=1000] - timeout for requests in milliseconds. 10000ms by default
  * @prop {object} [defaultHeaders] - a list of default headers
@@ -138,7 +138,7 @@ class REST extends Helper {
 
     if (request.data instanceof Secret) {
       _debugRequest.data = '*****';
-      request.data = typeof request.data === 'object' ? { ...request.data.toString() } : request.data.toString();
+      request.data = (typeof request.data === 'object' && !(request.data instanceof Secret)) ? { ...request.data.toString() } : request.data.toString();
     }
 
     if ((typeof request.data) === 'string') {

package/lib/helper/TestCafe.js

@@ -42,7 +42,7 @@ const getHtmlSource = t => ClientFunction(() => document.getElementsByTagName('h
  *
  * ## Configuration
  *
- * This helper should be configured in codecept.json or codecept.conf.js
+ * This helper should be configured in codecept.conf.ts or codecept.conf.js
  *
  * * `url`: base url of website to be tested
  * * `show`: (optional, default: false) - show browser window.

package/lib/helper/WebDriver.js

@@ -44,11 +44,11 @@ let version;
  * @prop {string} browser browser in which to perform testing.
  * @prop {string} [basicAuth] - (optional) the basic authentication to pass to base url. Example: {username: 'username', password: 'password'}
  * @prop {string} [host=localhost] - WebDriver host to connect.
- * @prop {string} [port=4444] - WebDriver port to connect.
+ * @prop {number} [port=4444] - WebDriver port to connect.
  * @prop {string} [protocol=http] - protocol for WebDriver server.
  * @prop {string} [path=/wd/hub] - path to WebDriver server,
  * @prop {boolean} [restart=true] - restart browser between tests.
- * @prop {boolean} [smartWait=false] - **enables [SmartWait](http://codecept.io/acceptance/#smartwait)**; wait for additional milliseconds for element to appear. Enable for 5 secs: "smartWait": 5000.
+ * @prop {boolean|number} [smartWait=false] - **enables [SmartWait](http://codecept.io/acceptance/#smartwait)**; wait for additional milliseconds for element to appear. Enable for 5 secs: "smartWait": 5000.
  * @prop {boolean} [disableScreenshots=false] - don't save screenshots on failure.
  * @prop {boolean} [fullPageScreenshots=false] (optional - make full page screenshots on failure.
  * @prop {boolean} [uniqueScreenshotNames=false] - option to prevent screenshot override if you have scenarios with the same name in different suites.
@@ -916,7 +916,7 @@ class WebDriver extends Helper {
    * {{ react }}
    */
   async click(locator, context = null) {
-    const clickMethod = this.browser.isMobile && this.browser.capabilities.platformName !== 'android' ? 'touchClick' : 'elementClick';
+    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick';
     const locateFn = prepareLocateFn.call(this, context);
 
     const res = await findClickable.call(this, locator, locateFn);
@@ -1126,7 +1126,7 @@ class WebDriver extends Helper {
    * Appium: not tested
    */
   async checkOption(field, context = null) {
-    const clickMethod = this.browser.isMobile && this.browser.capabilities.platformName !== 'android' ? 'touchClick' : 'elementClick';
+    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick';
     const locateFn = prepareLocateFn.call(this, context);
 
     const res = await findCheckable.call(this, field, locateFn);
@@ -1145,7 +1145,7 @@ class WebDriver extends Helper {
    * Appium: not tested
    */
   async uncheckOption(field, context = null) {
-    const clickMethod = this.browser.isMobile && this.browser.capabilities.platformName !== 'android' ? 'touchClick' : 'elementClick';
+    const clickMethod = this.browser.isMobile && !this.browser.isW3C ? 'touchClick' : 'elementClick';
     const locateFn = prepareLocateFn.call(this, context);
 
     const res = await findCheckable.call(this, field, locateFn);
@@ -1632,7 +1632,7 @@ class WebDriver extends Helper {
       assertElementExists(res);
       const elem = usingFirstElement(res);
       const elementId = getElementId(elem);
-      if (this.browser.isMobile && this.browser.capabilities.platformName !== 'android') return this.browser.touchScroll(offsetX, offsetY, elementId);
+      if (this.browser.isMobile && !this.browser.isW3C) return this.browser.touchScroll(offsetX, offsetY, elementId);
       const location = await elem.getLocation();
       assertElementExists(location, 'Failed to receive', 'location');
       /* eslint-disable prefer-arrow-callback */
@@ -1640,7 +1640,7 @@ class WebDriver extends Helper {
       /* eslint-enable */
     }
 
-    if (this.browser.isMobile && this.browser.capabilities.platformName !== 'android') return this.browser.touchScroll(locator, offsetX, offsetY);
+    if (this.browser.isMobile && !this.browser.isW3C) return this.browser.touchScroll(locator, offsetX, offsetY);
 
     /* eslint-disable prefer-arrow-callback, comma-dangle */
     return this.browser.execute(function (x, y) { return window.scrollTo(x, y); }, offsetX, offsetY);

package/lib/plugin/wdio.js

@@ -85,6 +85,8 @@ let restartsSession;
  *
  */
 module.exports = (config) => {
+  // Keep initial configs to pass as options to wdio services
+  const wdioOptions = { ...config };
   const webDriver = container.helpers('WebDriver');
   if (webDriver) {
     config = Object.assign(webDriver.options, config);
@@ -108,7 +110,9 @@ module.exports = (config) => {
         if (version.indexOf('5') === 0) {
           launchers.push(new Launcher(config));
         } else {
-          const options = { logPath: global.output_dir, installArgs: seleniumInstallArgs, args: seleniumArgs };
+          const options = {
+            logPath: global.output_dir, installArgs: seleniumInstallArgs, args: seleniumArgs, ...wdioOptions,
+          };
           launchers.push(new Launcher(options, [config.capabilities], config));
         }
       }
@@ -215,7 +219,12 @@ module.exports = (config) => {
     if (launcher.onPrepare) {
       event.dispatcher.on(event.all.before, () => {
         recorder.add(`launcher ${name} start`, async () => {
-          await launcher.onPrepare(config, config.capabilities);
+          // browserstack-service expects capabilities as array
+          if (launcher.constructor.name === 'BrowserstackLauncherService') {
+            await launcher.onPrepare(config, [config.capabilities]);
+          } else {
+            await launcher.onPrepare(config, config.capabilities);
+          }
           output.debug(`Started ${name}`);
         });
       });

package/lib/utils.js

@@ -132,6 +132,9 @@ module.exports.clearString = function (str) {
   if (!str) return '';
   /* Replace forbidden symbols in string
    */
+  if (str.endsWith('.')) {
+    str = str.slice(0, -1);
+  }
   return str
     .replace(/ /g, '_')
     .replace(/"/g, "'")