@wdio/cli 5.11.12 → 5.12.1

package/build/interface.js

@@ -27,6 +27,7 @@ class WDIOCLInterface extends _events.default {
     this.isWatchMode = isWatchMode;
     this.inDebugMode = false;
     this.specFileRetries = config.specFileRetries || 0;
+    this.endedNormally = false;
     this.on('job:start', this.addJob.bind(this));
     this.on('job:end', this.clearJob.bind(this));
     this.setup();
@@ -193,7 +194,7 @@ class WDIOCLInterface extends _events.default {
   }
 
   sigintTrigger() {
-    if (this.inDebugMode) {
+    if (this.inDebugMode || this.endedNormally) {
       return false;
     }
 
@@ -226,6 +227,7 @@ class WDIOCLInterface extends _events.default {
       return;
     }
 
+    this.endedNormally = true;
     this.printReporters();
     this.printSummary();
   }

package/build/launcher.js

@@ -60,22 +60,33 @@ class Launcher {
   }
 
   async run() {
-    let config = this.configParser.getConfig();
-    let caps = this.configParser.getCapabilities();
-    const launcher = (0, _utils.initialiseServices)(config, caps, 'launcher');
-    await this.runner.initialise();
-    log.info('Run onPrepare hook');
-    await (0, _utils2.runOnPrepareHook)(config.onPrepare, config, caps);
-    await (0, _utils2.runServiceHook)(launcher, 'onPrepare', config, caps);
     (0, _asyncExitHook.default)(this.exitHandler.bind(this));
-    let exitCode = await this.runMode(config, caps);
-    log.info('Run onComplete hook');
-    await (0, _utils2.runServiceHook)(launcher, 'onComplete', exitCode, config, caps);
-    const onCompleteResults = await (0, _utils2.runOnCompleteHook)(config.onComplete, config, caps, exitCode, this.interface.result);
-    exitCode = onCompleteResults.includes(1) ? 1 : exitCode;
-    await _logger.default.waitForBuffer();
-    this.interface.finalise();
-    return exitCode;
+    let exitCode;
+    let onCompleteResults;
+
+    try {
+      const config = this.configParser.getConfig();
+      const caps = this.configParser.getCapabilities();
+      const launcher = (0, _utils.initialiseServices)(config, caps, 'launcher');
+      await this.runner.initialise();
+      log.info('Run onPrepare hook');
+      await (0, _utils2.runOnPrepareHook)(config.onPrepare, config, caps);
+      await (0, _utils2.runServiceHook)(launcher, 'onPrepare', config, caps);
+      exitCode = await this.runMode(config, caps);
+      log.info('Run onComplete hook');
+      await (0, _utils2.runServiceHook)(launcher, 'onComplete', exitCode, config, caps);
+      onCompleteResults = await (0, _utils2.runOnCompleteHook)(config.onComplete, config, caps, exitCode, this.interface.result);
+      exitCode = onCompleteResults.includes(1) ? 1 : exitCode;
+      await _logger.default.waitForBuffer();
+      this.interface.finalise();
+      return exitCode;
+    } catch (err) {
+      if (!onCompleteResults) {
+        process.emit('shutdown', 1);
+      }
+
+      throw err;
+    }
   }
 
   runMode(config, caps) {

package/build/run.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = run;
+exports.launch = launch;
 
 var _fs = _interopRequireDefault(require("fs"));
 
@@ -60,7 +61,5 @@ function run(params) {
 
 function launch(wdioConf, params) {
   const launcher = new _launcher.default(wdioConf, params);
-  launcher.run().then(code => process.nextTick(() => process.exit(code)), e => process.nextTick(() => {
-    throw e;
-  }));
+  return launcher.run();
 }

package/build/templates/wdio.conf.tpl.ejs

@@ -220,7 +220,7 @@ exports.config = {
         source: true,       // <boolean> hide source uris
         profile: [],        // <string[]> (name) specify the profile to use
         strict: false,      // <boolean> fail if there are any undefined or pending steps
-        tags: [],           // <string[]> (expression) only execute the features or scenarios with tags matching the expression
+        tagExpression: '',  // <string> (expression) only execute the features or scenarios with tags matching the expression
         timeout: 60000,     // <number> timeout for step definitions
         ignoreUndefinedDefinitions: false, // <boolean> Enable this config to treat undefined definitions as warnings.
     },
@@ -305,22 +305,22 @@ exports.config = {
     /**
      * Runs before a Cucumber feature
      */
-    // beforeFeature: function (uri, feature) {
+    // beforeFeature: function (uri, feature, scenarios) {
     // },
     /**
      * Runs before a Cucumber scenario
      */
-    // beforeScenario: function (uri, feature, scenario) {
+    // beforeScenario: function (uri, feature, scenario, sourceLocation) {
     // },
     /**
      * Runs before a Cucumber step
      */
-    // beforeStep: function (uri, feature, scenario, step, sourceLocation) {
+    // beforeStep: function (uri, feature) {
     // },
     /**
      * Runs after a Cucumber step
      */
-    // afterStep: function (uri, feature, scenario, step, result, sourceLocation) {
+    // afterStep: function (uri, feature, { error, result }) {
     // },
     /**
      * Runs after a Cucumber scenario
@@ -330,7 +330,7 @@ exports.config = {
     /**
      * Runs after a Cucumber feature
      */
-    // afterFeature: function (uri, feature) {
+    // afterFeature: function (uri, feature, scenarios) {
     // },
     <% } %>
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/cli",
-  "version": "5.11.12",
+  "version": "5.12.1",
   "description": "WebdriverIO testrunner command line interface",
   "author": "Christian Bromann <christian@saucelabs.com>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/master/packages/wdio-cli",
@@ -35,9 +35,9 @@
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
   "dependencies": {
-    "@wdio/config": "^5.11.0",
-    "@wdio/logger": "^5.11.0",
-    "@wdio/utils": "^5.11.1",
+    "@wdio/config": "^5.12.1",
+    "@wdio/logger": "^5.12.1",
+    "@wdio/utils": "^5.12.1",
     "async-exit-hook": "^2.0.1",
     "chalk": "^2.3.2",
     "chokidar": "^3.0.0",
@@ -50,12 +50,12 @@
     "lodash.pickby": "^4.6.0",
     "lodash.union": "^4.6.0",
     "log-update": "^3.2.0",
-    "webdriverio": "^5.11.12",
+    "webdriverio": "^5.12.1",
     "yargs": "^13.2.4",
     "yarn-install": "^1.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "32d9805f8dee10f0665e31eed14f774aaa48c914"
+  "gitHead": "848151e5fdcb8b694c1a273b9b69852c22875687"
 }