codeceptjs 3.0.3 → 3.0.7

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);
       });
 
@@ -131,6 +137,8 @@ class Cli extends Base {
       output.print(output.styles.bold('-- FAILURES:'));
     }
 
+    const failuresLog = [];
+
     // failures
     if (stats.failures) {
       // append step traces
@@ -178,10 +186,17 @@ class Cli extends Base {
         return test;
       });
 
+      const originalLog = Base.consoleLog;
+      Base.consoleLog = (...data) => {
+        failuresLog.push([...data]);
+        originalLog(...data);
+      };
       Base.list(this.failures);
+      Base.consoleLog = originalLog;
       console.log();
     }
 
+    event.emit(event.all.failures, { failuresLog, stats });
     output.result(stats.passes, stats.failures, stats.pending, ms(stats.duration));
 
     if (stats.failures && output.level() < 3) {

package/lib/codecept.js

@@ -131,7 +131,15 @@ class Codecept {
     if (!pattern) {
       patterns = [];
       if (this.config.tests && !this.opts.features) patterns.push(this.config.tests);
-      if (this.config.gherkin.features && !this.opts.tests) patterns.push(this.config.gherkin.features);
+      if (this.config.gherkin.features && !this.opts.tests) {
+        if (Array.isArray(this.config.gherkin.features)) {
+          this.config.gherkin.features.forEach(feature => {
+            patterns.push(feature);
+          });
+        } else {
+          patterns.push(this.config.gherkin.features);
+        }
+      }
     }
 
     for (pattern of patterns) {

package/lib/command/interactive.js

@@ -4,21 +4,20 @@ 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;
+  const configFile = options.config;
+
+  const config = getConfig(configFile);
+  const testsPath = getTestRoot(configFile);
 
-  const testsPath = getTestRoot(path);
-  const config = getConfig(testsPath);
   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 +35,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/command/workers/runTests.js

@@ -39,9 +39,12 @@ codecept.init(testRoot);
 codecept.loadTests();
 const mocha = container.mocha();
 filterTests();
-if (mocha.suite.total()) {
-  runTests();
-}
+
+(async function () {
+  if (mocha.suite.total()) {
+    await runTests();
+  }
+}());
 
 async function runTests() {
   try {
@@ -116,14 +119,16 @@ function initializeListeners() {
   // tests
   event.dispatcher.on(event.test.before, test => sendToParentThread({ event: event.test.before, workerIndex, data: simplifyTest(test) }));
   event.dispatcher.on(event.test.after, test => sendToParentThread({ event: event.test.after, workerIndex, data: simplifyTest(test) }));
-  event.dispatcher.on(event.test.finished, test => sendToParentThread({ event: event.test.finished, workerIndex, data: simplifyTest(test) }));
-  event.dispatcher.on(event.test.failed, test => sendToParentThread({ event: event.test.failed, workerIndex, data: simplifyTest(test) }));
-  event.dispatcher.on(event.test.passed, test => sendToParentThread({ event: event.test.passed, workerIndex, data: simplifyTest(test) }));
+  // we should force-send correct errors to prevent race condition
+  event.dispatcher.on(event.test.finished, (test, err) => sendToParentThread({ event: event.test.finished, workerIndex, data: simplifyTest(test, err) }));
+  event.dispatcher.on(event.test.failed, (test, err) => sendToParentThread({ event: event.test.failed, workerIndex, data: simplifyTest(test, err) }));
+  event.dispatcher.on(event.test.passed, (test, err) => sendToParentThread({ event: event.test.passed, workerIndex, data: simplifyTest(test, err) }));
   event.dispatcher.on(event.test.started, test => sendToParentThread({ event: event.test.started, workerIndex, data: simplifyTest(test) }));
   event.dispatcher.on(event.test.skipped, test => sendToParentThread({ event: event.test.skipped, workerIndex, data: simplifyTest(test) }));
 
   event.dispatcher.on(event.hook.failed, (test, err) => sendToParentThread({ event: event.hook.failed, workerIndex, data: simplifyTest(test, err) }));
   event.dispatcher.on(event.hook.passed, (test, err) => sendToParentThread({ event: event.hook.passed, workerIndex, data: simplifyTest(test, err) }));
+  event.dispatcher.on(event.all.failures, (data) => sendToParentThread({ event: event.all.failures, workerIndex, data }));
 
   // all
   event.dispatcher.once(event.all.result, () => parentPort.close());

package/lib/config.js

@@ -77,13 +77,18 @@ 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`);
   }
 
   /**
    * Get current config.
-   * @param {string} key
-   * @param {*} val
+   * @param {string} [key]
+   * @param {*} [val]
    * @return {*}
    */
   static get(key, val) {

package/lib/event.js

@@ -99,11 +99,13 @@ module.exports = {
    * @property {'global.before'} before
    * @property {'global.after'} after
    * @property {'global.result'} result
+   * @property {'global.failures'} failures
    */
   all: {
     before: 'global.before',
     after: 'global.after',
     result: 'global.result',
+    failures: 'global.failures',
   },
   /**
    * @type {object}

package/lib/helper/Appium.js

@@ -183,6 +183,7 @@ class Appium extends Webdriver {
     config.capabilities.browserName = config.browser || config.capabilities.browserName;
     config.capabilities.app = config.app || config.capabilities.app;
     config.capabilities.platformName = config.platform || config.capabilities.platformName;
+    config.capabilities.tunnelIdentifier = config.tunnelIdentifier || config.capabilities.tunnelIdentifier; // Adding the code to connect to sauce labs via sauce tunnel
     config.waitForTimeout /= 1000; // convert to seconds
 
     // [CodeceptJS compatible] transform host to hostname

package/lib/helper/GraphQL.js

@@ -1,8 +1,6 @@
-let axios = require('axios');
+const axios = require('axios').default;
 const Helper = require('../helper');
 
-let headers = {};
-
 /**
  * GraphQL helper allows to send additional requests to a GraphQl endpoint during acceptance tests.
  * [Axios](https://github.com/axios/axios) library is used to perform requests.
@@ -41,15 +39,16 @@ let headers = {};
 class GraphQL extends Helper {
   constructor(config) {
     super(config);
-    axios = require('axios');
+    this.axios = axios.create();
+    this.headers = {};
     this.options = {
       timeout: 10000,
       defaultHeaders: {},
       endpoint: '',
     };
     this.options = Object.assign(this.options, config);
-    headers = { ...this.options.defaultHeaders };
-    axios.defaults.headers = this.options.defaultHeaders;
+    this.headers = { ...this.options.defaultHeaders };
+    this.axios.defaults.headers = this.options.defaultHeaders;
   }
 
   static _checkRequirements() {
@@ -66,10 +65,10 @@ class GraphQL extends Helper {
    * @param {object} request
    */
   async _executeQuery(request) {
-    axios.defaults.timeout = request.timeout || this.options.timeout;
+    this.axios.defaults.timeout = request.timeout || this.options.timeout;
 
-    if (headers && headers.auth) {
-      request.auth = headers.auth;
+    if (this.headers && this.headers.auth) {
+      request.auth = this.headers.auth;
     }
 
     request.headers = Object.assign(request.headers, {
@@ -84,7 +83,7 @@ class GraphQL extends Helper {
 
     let response;
     try {
-      response = await axios(request);
+      response = await this.axios(request);
     } catch (err) {
       if (!err.response) throw err;
       this.debugSection(

package/lib/helper/Nightmare.js

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