codeceptjs 3.1.3 → 3.2.0

package/lib/helper/WebDriver.js

@@ -875,7 +875,7 @@ class WebDriver extends Helper {
    * I.defineTimeout({ implicit: 10000, pageLoad: 10000, script: 5000 });
    * ```
    *
-   * @param {WebdriverIO.Timeouts} timeouts WebDriver timeouts object.
+   * @param {*} timeouts WebDriver timeouts object.
    */
   defineTimeout(timeouts) {
     return this._defineBrowserTimeout(this.browser, timeouts);
@@ -2353,18 +2353,6 @@ class WebDriver extends Helper {
     return this.browser.waitUntil(async () => this.browser.execute(fn, ...args), { timeout: aSec * 1000, timeoutMsg: '' });
   }
 
-  /**
-   * {{> waitUntil }}
-   */
-  async waitUntil(fn, sec = null, timeoutMsg = null, interval = null) {
-    const aSec = sec || this.options.waitForTimeout;
-    const _interval = typeof interval === 'number' ? interval * 1000 : null;
-    if (isWebDriver5()) {
-      return this.browser.waitUntil(fn, aSec * 1000, timeoutMsg, _interval);
-    }
-    return this.browser.waitUntil(fn, { timeout: aSec * 1000, timeoutMsg, interval: _interval });
-  }
-
   /**
    * {{> switchTo }}
    */

package/lib/interfaces/featureConfig.js

@@ -21,6 +21,9 @@ class FeatureConfig {
    * @returns {this}
    */
   timeout(timeout) {
+    console.log(`Feature('${this.suite.title}').timeout(${timeout}) is deprecated!`);
+    console.log(`Please use Feature('${this.suite.title}', { timeout: ${timeout / 1000} }) instead`);
+    console.log('Timeout should be set in seconds');
     this.suite.timeout(timeout);
     return this;
   }

package/lib/interfaces/scenarioConfig.js

@@ -45,6 +45,10 @@ class ScenarioConfig {
    * @returns {this}
    */
   timeout(timeout) {
+    console.log(`Scenario('${this.test.title}', () => {}).timeout(${timeout}) is deprecated!`);
+    console.log(`Please use Scenario('${this.test.title}', { timeout: ${timeout / 1000} }, () => {}) instead`);
+    console.log('Timeout should be set in seconds');
+
     this.test.timeout(timeout);
     return this;
   }

package/lib/listener/steps.js

@@ -1,5 +1,7 @@
+const debug = require('debug')('codeceptjs:steps');
 const event = require('../event');
 const store = require('../store');
+const output = require('../output');
 
 let currentTest;
 let currentHook;
@@ -9,6 +11,7 @@ let currentHook;
  */
 module.exports = function () {
   event.dispatcher.on(event.test.before, (test) => {
+    test.startedAt = +new Date();
     test.artifacts = {};
   });
 
@@ -19,17 +22,23 @@ module.exports = function () {
     else currentTest.retryNum += 1;
   });
 
-  event.dispatcher.on(event.test.after, () => {
+  event.dispatcher.on(event.test.after, (test) => {
     currentTest = null;
   });
 
-  event.dispatcher.on(event.hook.passed, () => {
-    currentHook = null;
+  event.dispatcher.on(event.test.finished, (test) => {
   });
 
   event.dispatcher.on(event.hook.started, (suite) => {
     currentHook = suite.ctx.test;
     currentHook.steps = [];
+
+    if (suite.ctx && suite.ctx.test) output.log(`--- STARTED ${suite.ctx.test.title} ---`);
+  });
+
+  event.dispatcher.on(event.hook.passed, (suite) => {
+    currentHook = null;
+    if (suite.ctx && suite.ctx.test) output.log(`--- ENDED ${suite.ctx.test.title} ---`);
   });
 
   event.dispatcher.on(event.test.failed, () => {
@@ -51,6 +60,7 @@ module.exports = function () {
   });
 
   event.dispatcher.on(event.test.passed, () => {
+    if (!currentTest) return;
     // To be sure that passed test will be passed in report
     delete currentTest.err;
     currentTest.state = 'passed';
@@ -58,10 +68,18 @@ module.exports = function () {
 
   event.dispatcher.on(event.step.started, (step) => {
     if (store.debugMode) return;
+    step.startedAt = +new Date();
     if (currentHook && Array.isArray(currentHook.steps)) {
       return currentHook.steps.push(step);
     }
     if (!currentTest || !currentTest.steps) return;
     currentTest.steps.push(step);
   });
+
+  event.dispatcher.on(event.step.finished, (step) => {
+    if (store.debugMode) return;
+    step.finishedAt = +new Date();
+    if (step.startedAt) step.duration = step.finishedAt - step.startedAt;
+    debug(`Step '${step}' finished; Duration: ${step.duration}ms`);
+  });
 };

package/lib/listener/timeout.js

@@ -0,0 +1,71 @@
+const event = require('../event');
+const output = require('../output');
+const recorder = require('../recorder');
+const Config = require('../config');
+const { timeouts } = require('../store');
+
+module.exports = function () {
+  let timeout;
+  let timeoutStack = [];
+  let currentTest;
+  let currentTimeout;
+
+  if (!timeouts) {
+    console.log('Timeouts were disabled');
+    return;
+  }
+
+  event.dispatcher.on(event.suite.before, (suite) => {
+    timeoutStack = [];
+    const globalTimeout = Config.get('timeout');
+    if (globalTimeout) {
+      if (globalTimeout >= 1000) {
+        console.log(`Warning: Timeout was set to ${globalTimeout}secs.\nGlobal timeout should be specified in seconds.`);
+      }
+      timeoutStack.push(globalTimeout);
+    }
+    if (suite.totalTimeout) timeoutStack.push(suite.totalTimeout);
+    output.log(`Timeouts: ${timeoutStack}`);
+  });
+
+  event.dispatcher.on(event.test.before, (test) => {
+    currentTest = test;
+    timeout = test.totalTimeout || timeoutStack[timeoutStack.length - 1];
+    if (!timeout) return;
+    currentTimeout = timeout;
+    output.debug(`Test Timeout: ${timeout}s`);
+    timeout *= 1000;
+  });
+
+  event.dispatcher.on(event.test.passed, (test) => {
+    currentTest = null;
+  });
+
+  event.dispatcher.on(event.test.failed, (test) => {
+    currentTest = null;
+  });
+
+  event.dispatcher.on(event.step.before, (step) => {
+    if (typeof timeout !== 'number') return;
+
+    if (timeout < 0) {
+      step.totalTimeout = 0.01;
+    } else {
+      step.totalTimeout = timeout;
+    }
+  });
+
+  event.dispatcher.on(event.step.finished, (step) => {
+    timeout -= step.duration;
+
+    if (typeof timeout === 'number' && timeout <= 0 && recorder.isRunning()) {
+      if (currentTest && currentTest.callback) {
+        recorder.reset();
+        // replace mocha timeout with custom timeout
+        currentTest.timeout(0);
+        currentTest.callback(new Error(`Timeout ${currentTimeout}s exceeded (with Before hook)`));
+        currentTest.timedOut = true;
+      }
+    }
+  });
+};

package/lib/locator.js

@@ -313,11 +313,14 @@ Locator.build = (locator) => {
 
 /**
  * Filters to modify locators
+ * @type {Array<function(CodeceptJS.LocatorOrString, Locator): void>}
  */
 Locator.filters = [];
 
 /**
  * Appends new `Locator` filter to an `Locator.filters` array, and returns the new length of the array.
+ * @param {function(CodeceptJS.LocatorOrString, Locator): void} fn
+ * @returns {number}
  */
 Locator.addFilter = fn => Locator.filters.push(fn);
 

package/lib/plugin/allure.js

@@ -283,7 +283,12 @@ module.exports = (config) => {
   let maxLevel;
   function finishMetastep(level) {
     const metaStepsToFinish = currentMetaStep.splice(maxLevel - level);
-    metaStepsToFinish.forEach(() => reporter.endStep('passed'));
+    metaStepsToFinish.forEach(() => {
+      // only if the current step is of type Step, end it.
+      if (reporter.suites && reporter.suites.length && reporter.suites[0].currentStep && reporter.suites[0].currentStep.constructor.name === 'Step') {
+        reporter.endStep('passed');
+      }
+    });
   }
 
   function startMetaStep(metaStep, level = 0) {

package/lib/plugin/retryTo.js

@@ -0,0 +1,130 @@
+const recorder = require('../recorder');
+const store = require('../store');
+const { debug } = require('../output');
+
+const defaultConfig = {
+  registerGlobal: true,
+  pollInterval: 200,
+};
+
+/**
+ *
+ *
+ * Adds global `retryTo` which retries steps a few times before failing.
+ *
+ * Enable this plugin in `codecept.conf.js` (enabled by default for new setups):
+ *
+ * ```js
+ * plugins: {
+ *   retryTo: {
+ *     enabled: true
+ *   }
+ * }
+ * ```
+ *
+ * Use it in your tests:
+ *
+ * ```js
+ * // retry these steps 5 times before failing
+ * await retryTo((tryNum) => {
+ *   I.switchTo('#editor frame');
+ *   I.click('Open');
+ *   I.see('Opened')
+ * }, 5);
+ * ```
+ * Set polling interval as 3rd argument (200ms by default):
+ *
+ * ```js
+ * // retry these steps 5 times before failing
+ * await retryTo((tryNum) => {
+ *   I.switchTo('#editor frame');
+ *   I.click('Open');
+ *   I.see('Opened')
+ * }, 5, 100);
+ * ```
+ *
+ * Default polling interval can be changed in a config:
+ *
+ * ```js
+ * plugins: {
+ *   retryTo: {
+ *     enabled: true,
+ *     pollInterval: 500,
+ *   }
+ * }
+ * ```
+ *
+ * Disables retryFailedStep plugin for steps inside a block;
+ *
+ * Use this plugin if:
+ *
+ * * you need repeat a set of actions in flaky tests
+ * * iframe was not rendered and you need to retry switching to it
+ *
+ *
+ * #### Configuration
+ *
+ * * `pollInterval` - default interval between retries in ms. 200 by default.
+ * * `registerGlobal` - to register `retryTo` function globally, true by default
+ *
+ * If `registerGlobal` is false you can use retryTo from the plugin:
+ *
+ * ```js
+ * const retryTo = codeceptjs.container.plugins('retryTo');
+ * ```
+ *
+*/
+module.exports = function (config) {
+  config = Object.assign(defaultConfig, config);
+
+  if (config.registerGlobal) {
+    global.retryTo = retryTo;
+  }
+  return retryTo;
+
+  function retryTo(callback, maxTries, pollInterval = undefined) {
+    const mode = store.debugMode;
+    let tries = 1;
+    if (!pollInterval) pollInterval = config.pollInterval;
+
+    let err = null;
+
+    return new Promise((done) => {
+      const tryBlock = () => {
+        recorder.session.start(`retryTo ${tries}`);
+        callback(tries);
+        recorder.add(() => {
+          recorder.session.restore(`retryTo ${tries}`);
+          done(null);
+        });
+        recorder.session.catch((e) => {
+          err = e;
+          recorder.session.restore(`retryTo ${tries}`);
+          tries++;
+          // recorder.session.restore(`retryTo`);
+          if (tries <= maxTries) {
+            debug(`Error ${err}... Retrying`);
+            err = null;
+
+            recorder.add(`retryTo ${tries}`, () => {
+              tryBlock();
+              // recorder.add(() => new Promise(done => setTimeout(done, pollInterval)));
+            });
+          } else {
+            // recorder.throw(err);
+            done(null);
+          }
+        });
+        // return recorder.promise();
+      };
+
+      recorder.add('retryTo', async () => {
+        store.debugMode = true;
+        tryBlock();
+        // recorder.add(() => recorder.session.restore(`retryTo ${tries-1}`));
+      });
+    }).then(() => {
+      if (err) recorder.throw(err);
+    });
+  }
+};

package/lib/plugin/screenshotOnFail.js

@@ -98,6 +98,7 @@ module.exports = function (config) {
         }
         await helper.saveScreenshot(fileName, options.fullPageScreenshots);
 
+        if (!test.artifacts) test.artifacts = {};
         test.artifacts.screenshot = path.join(global.output_dir, fileName);
         if (Container.mocha().options.reporterOptions['mocha-junit-reporter'] && Container.mocha().options.reporterOptions['mocha-junit-reporter'].options.attachments) {
           test.attachments = [path.join(global.output_dir, fileName)];

package/lib/plugin/stepByStepReport.js

@@ -20,6 +20,7 @@ const defaultConfig = {
   fullPageScreenshots: false,
   output: global.output_dir,
   screenshotsForAllureReport: false,
+  disableScreenshotOnFail: true,
 };
 
 const templates = {};
@@ -56,6 +57,7 @@ const templates = {};
  * * `fullPageScreenshots`: should full page screenshots be used. Default: false.
  * * `output`: a directory where reports should be stored. Default: `output`.
  * * `screenshotsForAllureReport`: If Allure plugin is enabled this plugin attaches each saved screenshot to allure report. Default: false.
+ * * `disableScreenshotOnFail : Disables the capturing of screeshots after the failed step. Default: true.
  *
  * @param {*} config
  */
@@ -80,6 +82,7 @@ module.exports = function (config) {
   let error;
   let savedStep = null;
   let currentTest = null;
+  let scenarioFailed = false;
 
   const recordedTests = {};
   const pad = '0000';
@@ -135,10 +138,14 @@ module.exports = function (config) {
     if (isStepIgnored(step)) return;
     if (savedStep === step) return; // already saved
     // Ignore steps from BeforeSuite function
+    if (scenarioFailed && config.disableScreenshotOnFail) return;
     if (step.metaStep && step.metaStep.name === 'BeforeSuite') return;
 
     const fileName = `${pad.substring(0, pad.length - stepNum.toString().length) + stepNum.toString()}.png`;
     try {
+      if (step.status === 'failed') {
+        scenarioFailed = true;
+      }
       stepNum++;
       slides[fileName] = step;
       await helper.saveScreenshot(path.relative(reportDir, path.join(dir, fileName)), config.fullPageScreenshots);

package/lib/plugin/stepTimeout.js

@@ -0,0 +1,90 @@
+const event = require('../event');
+
+const defaultConfig = {
+  timeout: 150,
+  force: false,
+  noTimeoutSteps: [
+    'amOnPage',
+    'wait*',
+  ],
+  customTimeoutSteps: [],
+};
+
+/**
+ * Set timeout for test steps globally.
+ *
+ * Add this plugin to config file:
+ *
+ * ```js
+ * plugins: {
+ *     stepTimeout: {
+ *        enabled: true
+ *     }
+ * }
+ * ```
+ *
+ *
+ * Run tests with plugin enabled:
+ *
+ * ```
+ * npx codeceptjs run --plugins stepTimeout
+ * ```
+ *
+ * #### Configuration:
+ *
+ * * `timeout` - global step timeout, default 150 seconds
+ * * `force` - whether to use timeouts set in plugin config to override step timeouts set in code with I.limitTime(x).action(...), default false
+ * * `noTimeoutSteps` - an array of steps with no timeout. Default:
+ *     * `amOnPage`
+ *     * `wait*`
+ *
+ *   you could set your own noTimeoutSteps which would replace the default one.
+ *
+ * * `customTimeoutSteps` - an array of step actions with custom timeout. Use it to override or extend noTimeoutSteps.
+ * You can use step names or step prefixes ending with `*`. As such, `wait*` will match all steps starting with `wait`.
+ *
+ * #### Example
+ *
+ * ```js
+ * plugins: {
+ *     stepTimeout: {
+ *         enabled: true,
+ *         force: true,
+ *         noTimeoutSteps: [
+ *           'scroll*', // ignore all scroll steps
+ *           /Cookie/, // ignore all steps with a Cookie in it (by regexp)
+ *         ],
+ *         customTimeoutSteps: [
+ *           ['myFlakyStep*', 1],
+ *           ['scrollWhichRequiresTimeout', 5],
+ *         ]
+ *     }
+ * }
+ * ```
+ *
+ */
+module.exports = (config) => {
+  config = Object.assign(defaultConfig, config);
+  // below override rule makes sure customTimeoutSteps go first but then they override noTimeoutSteps in case of exact pattern match
+  config.customTimeoutSteps = config.customTimeoutSteps.concat(config.noTimeoutSteps).concat(config.customTimeoutSteps);
+
+  event.dispatcher.on(event.step.before, (step) => {
+    let stepTimeout;
+    for (let stepRule of config.customTimeoutSteps) {
+      let customTimeout = 0;
+      if (Array.isArray(stepRule)) {
+        if (stepRule.length > 1) customTimeout = stepRule[1];
+        stepRule = stepRule[0];
+      }
+      if (stepRule instanceof RegExp
+        ? step.name.match(stepRule)
+        : (step.name === stepRule || stepRule.indexOf('*') && step.name.startsWith(stepRule.slice(0, -1)))
+      ) {
+        stepTimeout = customTimeout;
+        break;
+      }
+    }
+    stepTimeout = stepTimeout === undefined ? config.timeout : stepTimeout;
+    step.totalTimeout = stepTimeout * 1000;
+  });
+};

package/lib/recorder.js

@@ -118,7 +118,7 @@ module.exports = {
      * @inner
      */
     start(name) {
-      log(`${currentQueue()}Starting <${name}> session`);
+      debug(`${currentQueue()}Starting <${name}> session`);
       tasks.push('--->');
       oldPromises.push(promise);
       this.running = true;
@@ -132,7 +132,7 @@ module.exports = {
      */
     restore(name) {
       tasks.push('<---');
-      log(`${currentQueue()}Finalize <${name}> session`);
+      debug(`${currentQueue()}Finalize <${name}> session`);
       this.running = false;
       sessionId = null;
       this.catch(errFn);
@@ -160,10 +160,11 @@ module.exports = {
    *     undefined: `add(fn)` -> `false` and `add('step',fn)` -> `true`
    *     true: it will retries if `retryOpts` set.
    *     false: ignore `retryOpts` and won't retry.
+   * @param {number} [timeout]
    * @return {Promise<*> | undefined}
    * @inner
    */
-  add(taskName, fn = undefined, force = false, retry = undefined) {
+  add(taskName, fn = undefined, force = false, retry = undefined, timeout = undefined) {
     if (typeof taskName === 'function') {
       fn = taskName;
       taskName = fn.toString();
@@ -180,13 +181,15 @@ module.exports = {
       const retryOpts = this.retries.slice(-1).pop();
       // no retries or unnamed tasks
       if (!retryOpts || !taskName || !retry) {
-        return Promise.resolve(res).then(fn);
+        const [promise, timer] = getTimeoutPromise(timeout, taskName);
+        return Promise.race([promise, Promise.resolve(res).then(fn)]).finally(() => clearTimeout(timer));
       }
 
       const retryRules = this.retries.slice().reverse();
       return promiseRetry(Object.assign(defaultRetryOptions, retryOpts), (retry, number) => {
         if (number > 1) log(`${currentQueue()}Retrying... Attempt #${number}`);
-        return Promise.resolve(res).then(fn).catch((err) => {
+        const [promise, timer] = getTimeoutPromise(timeout, taskName);
+        return Promise.race([promise, Promise.resolve(res).then(fn)]).finally(() => clearTimeout(timer)).catch((err) => {
           for (const retryObj of retryRules) {
             if (!retryObj.when) return retry(err);
             if (retryObj.when && retryObj.when(err)) return retry(err);
@@ -343,6 +346,14 @@ module.exports = {
 
 };
 
+function getTimeoutPromise(timeoutMs, taskName) {
+  let timer;
+  if (timeoutMs) debug(`Timing out in ${timeoutMs}ms`);
+  return [new Promise((done, reject) => {
+    timer = setTimeout(() => { reject(new Error(`Action ${taskName} was interrupted on step timeout ${timeoutMs}ms`)); }, timeoutMs || 2e9);
+  }), timer];
+}
+
 function currentQueue() {
   let session = '';
   if (sessionId) session = `<${sessionId}> `;

package/lib/step.js

@@ -38,6 +38,9 @@ class Step {
     this.metaStep = undefined;
     /** @member {string} */
     this.stack = '';
+    /** @member {number} */
+    this.totalTimeout = undefined;
+
     this.setTrace();
   }
 

package/lib/store.js

@@ -5,6 +5,8 @@
 const store = {
   /** @type {boolean} */
   debugMode: false,
+  /** @type {boolean} */
+  timeouts: true,
 };
 
 module.exports = store;

package/lib/ui.js

@@ -65,7 +65,7 @@ module.exports = function (suite) {
 
       suite.addTest(scenario.test(test));
       if (opts.retries) test.retries(opts.retries);
-      if (opts.timeout) test.timeout(opts.timeout);
+      if (opts.timeout) test.totalTimeout = opts.timeout;
       test.opts = opts;
 
       return new ScenarioConfig(test);
@@ -103,7 +103,7 @@ module.exports = function (suite) {
       suite.timeout(0);
 
       if (opts.retries) suite.retries(opts.retries);
-      if (opts.timeout) suite.timeout(opts.timeout);
+      if (opts.timeout) suite.totalTimeout = opts.timeout;
 
       suite.tags = title.match(/(\@[a-zA-Z0-9-_]+)/g) || []; // match tags from title
       suite.file = file;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeceptjs",
-  "version": "3.1.3",
+  "version": "3.2.0",
   "description": "Supercharged End 2 End Testing Framework for NodeJS",
   "keywords": [
     "acceptance",
@@ -10,7 +10,6 @@
     "webdriver",
     "testcafe",
     "playwright",
-    "protractor",
     "bdd",
     "tdd",
     "testing"
@@ -103,7 +102,7 @@
     "chai-subset": "^1.6.0",
     "contributor-faces": "^1.0.3",
     "documentation": "^12.3.0",
-    "dtslint": "^3.6.12",
+    "dtslint": "^4.1.6",
     "electron": "^12.0.0",
     "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.2.1",
@@ -122,7 +121,6 @@
     "nightmare": "^3.0.2",
     "nodemon": "^1.19.4",
     "playwright": "^1.9.1",
-    "protractor": "^5.4.4",
     "puppeteer": "^10.0.0",
     "qrcode-terminal": "^0.12.0",
     "rosie": "^1.6.0",
@@ -133,9 +131,9 @@
     "testcafe": "^1.9.4",
     "ts-morph": "^3.1.3",
     "tsd-jsdoc": "^2.5.0",
-    "typescript": "^3.7.5",
+    "typescript": "^4.4.3",
     "wdio-docker-service": "^1.5.0",
-    "webdriverio": "^6.10.7",
+    "webdriverio": "^7.14.1",
     "xml2js": "^0.4.23",
     "xmldom": "^0.1.31",
     "xpath": "0.0.27"

package/typings/index.d.ts

@@ -66,7 +66,7 @@ declare namespace CodeceptJS {
   type StringOrSecret = string | CodeceptJS.Secret;
 
   interface HookCallback {
-    (args: SupportObject): void;
+    (args: SupportObject): void | Promise<void>;
   }
   interface Scenario extends IScenario {
     only: IScenario;
@@ -195,6 +195,7 @@ declare namespace Mocha {
   }
 
   interface Test extends Runnable {
+    artifacts: [],
     tags: any[];
   }
 }
@@ -202,3 +203,7 @@ declare namespace Mocha {
 declare module "codeceptjs" {
   export = codeceptjs;
 }
+
+declare module "@codeceptjs/helper" {
+  export = CodeceptJS.Helper;
+}