codeceptjs 2.6.10 → 2.6.11

package/lib/assert/empty.js

@@ -1,6 +1,6 @@
 const Assertion = require('../assert');
 const AssertionFailedError = require('./error');
-const template = require('../utils').template;
+const { template } = require('../utils');
 const output = require('../output');
 
 class EmptinessAssertion extends Assertion {

package/lib/assert/equal.js

@@ -1,6 +1,6 @@
 const Assertion = require('../assert');
 const AssertionFailedError = require('./error');
-const template = require('../utils').template;
+const { template } = require('../utils');
 const output = require('../output');
 
 class EqualityAssertion extends Assertion {

package/lib/assert/include.js

@@ -1,6 +1,6 @@
 const Assertion = require('../assert');
 const AssertionFailedError = require('./error');
-const template = require('../utils').template;
+const { template } = require('../utils');
 const output = require('../output');
 
 const MAX_LINES = 10;

package/lib/assert/truth.js

@@ -1,6 +1,6 @@
 const Assertion = require('../assert');
 const AssertionFailedError = require('./error');
-const template = require('../utils').template;
+const { template } = require('../utils');
 const output = require('../output');
 
 class TruthAssertion extends Assertion {

package/lib/codecept.js

@@ -1,8 +1,7 @@
-const existsSync = require('fs').existsSync;
-const readFileSync = require('fs').readFileSync;
+const { existsSync, readFileSync } = require('fs');
 const glob = require('glob');
 const fsPath = require('path');
-const resolve = require('path').resolve;
+const { resolve } = require('path');
 
 const container = require('./container');
 const Config = require('./config');

package/lib/command/configMigrate.js

@@ -5,11 +5,9 @@ const mkdirp = require('mkdirp');
 const path = require('path');
 const util = require('util');
 
-const print = require('../output').print;
-const success = require('../output').success;
-const error = require('../output').error;
-const fileExists = require('../utils').fileExists;
-const getTestRoot = require('./utils').getTestRoot;
+const { print, success, error } = require('../output');
+const { fileExists } = require('../utils');
+const { getTestRoot } = require('./utils');
 
 module.exports = function (initPath) {
   const testsPath = getTestRoot(initPath);

package/lib/command/definitions.js

@@ -1,8 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const getConfig = require('./utils').getConfig;
-const getTestRoot = require('./utils').getTestRoot;
+const { getConfig, getTestRoot } = require('./utils');
 const Codecept = require('../codecept');
 const container = require('../container');
 const output = require('../output');

package/lib/command/dryRun.js

@@ -1,5 +1,4 @@
-const getConfig = require('./utils').getConfig;
-const getTestRoot = require('./utils').getTestRoot;
+const { getConfig, getTestRoot } = require('./utils');
 const Config = require('../config');
 const Codecept = require('../codecept');
 const output = require('../output');

package/lib/command/gherkin/init.js

@@ -4,7 +4,7 @@ const path = require('path');
 const mkdirp = require('mkdirp');
 
 const output = require('../../output');
-const { fileExists, ucfirst, lcfirst } = require('../../utils');
+const { fileExists } = require('../../utils');
 const {
   getConfig, getTestRoot, updateConfig, safeFileWrite,
 } = require('../utils');

package/lib/command/gherkin/snippets.js

@@ -4,8 +4,8 @@ const { Parser } = require('gherkin');
 const glob = require('glob');
 const fsPath = require('path');
 
-const getConfig = require('../utils').getConfig;
-const getTestRoot = require('../utils').getTestRoot;
+const { getConfig } = require('../utils');
+const { getTestRoot } = require('../utils');
 const Codecept = require('../../codecept');
 const output = require('../../output');
 const { matchStep } = require('../../interfaces/bdd');
@@ -97,7 +97,7 @@ module.exports = function (genPath, options) {
 
   let stepFile = options.path || config.gherkin.steps[0];
   if (!fs.existsSync(stepFile)) {
-    output.error('Please enter a valid step file path ', stepFile);
+    output.error(`Please enter a valid step file path ${stepFile}`);
     process.exit(1);
   }
 

package/lib/command/gherkin/steps.js

@@ -1,7 +1,6 @@
-const getConfig = require('../utils').getConfig;
-const getTestRoot = require('../utils').getTestRoot;
+const { getConfig } = require('../utils');
+const { getTestRoot } = require('../utils');
 const Codecept = require('../../codecept');
-const container = require('../../container');
 const output = require('../../output');
 const { getSteps } = require('../../interfaces/bdd');
 

package/lib/command/info.js

@@ -1,7 +1,6 @@
 const envinfo = require('envinfo');
 
-const getConfig = require('./utils').getConfig;
-const getTestRoot = require('./utils').getTestRoot;
+const { getConfig, getTestRoot } = require('./utils');
 const Codecept = require('../codecept');
 const output = require('../output');
 

package/lib/command/init.js

@@ -21,7 +21,7 @@ const defaultConfig = {
   mocha: {},
 };
 
-const helpers = ['WebDriver', 'Puppeteer', 'TestCafe', 'Protractor', 'Nightmare', 'Appium', 'Playwright'];
+const helpers = require('../plugin/standardActingHelpers').slice();
 const translations = Object.keys(require('../../translations'));
 
 const noTranslation = 'English (no localization)';

package/lib/command/interactive.js

@@ -1,5 +1,4 @@
-const getConfig = require('./utils').getConfig;
-const getTestRoot = require('./utils').getTestRoot;
+const { getConfig, getTestRoot } = require('./utils');
 const recorder = require('../recorder');
 const Codecept = require('../codecept');
 const event = require('../event');

package/lib/command/list.js

@@ -1,9 +1,8 @@
-const getConfig = require('./utils').getConfig;
-const getTestRoot = require('./utils').getTestRoot;
+const { getConfig, getTestRoot } = require('./utils');
 const Codecept = require('../codecept');
 const container = require('../container');
-const getParamsToString = require('../parser').getParamsToString;
-const methodsOfObject = require('../utils').methodsOfObject;
+const { getParamsToString } = require('../parser');
+const { methodsOfObject } = require('../utils');
 const output = require('../output');
 
 module.exports = function (path) {

package/lib/command/run-multiple.js

@@ -1,12 +1,11 @@
-const fork = require('child_process').fork;
+const { fork } = require('child_process');
 const path = require('path');
 const crypto = require('crypto');
 
 const runHook = require('../hooks');
 const event = require('../event');
 const collection = require('./run-multiple/collection');
-const clearString = require('../utils').clearString;
-const replaceValueDeep = require('../utils').replaceValueDeep;
+const { clearString, replaceValueDeep } = require('../utils');
 const {
   getConfig, getTestRoot, fail,
 } = require('./utils');

package/lib/command/run-rerun.js

@@ -1,7 +1,5 @@
-const getConfig = require('./utils').getConfig;
-const getTestRoot = require('./utils').getTestRoot;
-const printError = require('./utils').printError;
-const createOutputDir = require('./utils').createOutputDir;
+const { getConfig, getTestRoot } = require('./utils');
+const { printError, createOutputDir } = require('./utils');
 const Config = require('../config');
 const Codecept = require('../rerun');
 

package/lib/command/run.js

@@ -1,8 +1,7 @@
 const mkdirp = require('mkdirp');
 const path = require('path');
 
-const getConfig = require('./utils').getConfig;
-const getTestRoot = require('./utils').getTestRoot;
+const { getConfig, getTestRoot } = require('./utils');
 const printError = require('./utils').printError;
 const createOutputDir = require('./utils').createOutputDir;
 const Config = require('../config');

package/lib/container.js

@@ -1,7 +1,7 @@
 const glob = require('glob');
 const path = require('path');
 
-const fileExists = require('./utils').fileExists;
+const { fileExists } = require('./utils');
 const Translation = require('./translation');
 const MochaFactory = require('./mochaFactory');
 const recorder = require('./recorder');

package/lib/data/context.js

@@ -1,4 +1,4 @@
-const isGenerator = require('../utils').isGenerator;
+const { isGenerator } = require('../utils');
 const DataTable = require('./table');
 const DataScenarioConfig = require('./dataScenarioConfig');
 

package/lib/event.js

@@ -1,7 +1,7 @@
 const events = require('events');
 
 const dispatcher = new events.EventEmitter();
-const log = require('./output').log;
+const { log } = require('./output');
 
 /**
  * @namespace

package/lib/helper/Appium.js

@@ -1,13 +1,12 @@
 let webdriverio;
 let wdioV4;
-let SCREEN_SIZE;
 
 const fs = require('fs');
 const requireg = require('requireg');
 
 const Webdriver = require('./WebDriver');
 const AssertionFailedError = require('../assert/error');
-const truth = require('../assert/truth').truth;
+const { truth } = require('../assert/truth');
 const recorder = require('../recorder');
 const Locator = require('../locator');
 const ConnectionRefused = require('./errors/ConnectionRefused');

package/lib/helper/FileSystem.js

@@ -3,9 +3,9 @@ const path = require('path');
 const fs = require('fs');
 
 const Helper = require('../helper');
-const fileExists = require('../utils').fileExists;
-const fileIncludes = require('../assert/include').fileIncludes;
-const fileEquals = require('../assert/equal').fileEquals;
+const { fileExists } = require('../utils');
+const { fileIncludes } = require('../assert/include');
+const { fileEquals } = require('../assert/equal');
 
 /**
  * Helper for testing filesystem.

package/lib/helper/Mochawesome.js

@@ -5,7 +5,7 @@ let currentSuite;
 const requireg = require('requireg');
 
 const Helper = require('../helper');
-const clearString = require('../utils').clearString;
+const { clearString } = require('../utils');
 
 class Mochawesome extends Helper {
   constructor(config) {

package/lib/helper/Nightmare.js

@@ -3,11 +3,11 @@ const requireg = require('requireg');
 const urlResolve = require('url').resolve;
 
 const Helper = require('../helper');
-const stringIncludes = require('../assert/include').includes;
-const urlEquals = require('../assert/equal').urlEquals;
-const equals = require('../assert/equal').equals;
-const empty = require('../assert/empty').empty;
-const truth = require('../assert/truth').truth;
+const { includes: stringIncludes } = require('../assert/include');
+const { urlEquals } = require('../assert/equal');
+const { equals } = require('../assert/equal');
+const { empty } = require('../assert/empty');
+const { truth } = require('../assert/truth');
 const Locator = require('../locator');
 const ElementNotFound = require('./errors/ElementNotFound');
 const {

package/lib/helper/Playwright.js

@@ -1,7 +1,6 @@
 const requireg = require('requireg');
 const path = require('path');
 const fs = require('fs');
-const fsExtra = require('fs-extra');
 
 const Helper = require('../helper');
 const Locator = require('../locator');
@@ -11,7 +10,7 @@ const { urlEquals } = require('../assert/equal');
 const { equals } = require('../assert/equal');
 const { empty } = require('../assert/empty');
 const { truth } = require('../assert/truth');
-const isElementClickable = require('./scripts/isElementClickable');
+
 const {
   xpathLocator,
   ucfirst,
@@ -160,7 +159,7 @@ const { createValueEngine, createDisabledEngine } = require('./extras/Playwright
  * }
  * ```
  *
- * #### Example #6: Lunach tests emulating iPhone 6
+ * #### Example #6: Launch tests emulating iPhone 6
  *
  *
  *
@@ -234,6 +233,7 @@ class Playwright extends Helper {
       keepBrowserState: false,
       show: false,
       defaultPopupAction: 'accept',
+      ignoreHTTPSErrors: false, // Adding it here o that context can be set up to ignore the SSL errors
     };
 
     config = Object.assign(defaults, config);
@@ -542,7 +542,7 @@ class Playwright extends Helper {
     this.browser.on('targetchanged', (target) => {
       this.debugSection('Url', target.url());
     });
-    this.browserContext = await this.browser.newContext({ acceptDownloads: true, ...this.options.emulate });
+    this.browserContext = await this.browser.newContext({ ignoreHTTPSErrors: this.options.ignoreHTTPSErrors, acceptDownloads: true, ...this.options.emulate });// Adding the HTTPSError ignore in the context so that we can ignore those errors
 
     const existingPages = await this.browserContext.pages();
 
@@ -694,7 +694,7 @@ class Playwright extends Helper {
     assertElementExists(els);
 
     // Use manual mouse.move instead of .hover() so the offset can be added to the coordinates
-    const { x, y } = await els[0]._clickablePoint();
+    const { x, y } = await clickablePoint(els[0]);
     await this.page.mouse.move(x + offsetX, y + offsetY);
     return this._waitForAction();
   }
@@ -750,7 +750,7 @@ class Playwright extends Helper {
       const els = await this._locate(locator);
       assertElementExists(els, locator, 'Element');
       await els[0].scrollIntoViewIfNeeded();
-      const elementCoordinates = await els[0]._clickablePoint();
+      const elementCoordinates = await clickablePoint(els[0]);
       await this.executeScript((offsetX, offsetY) => window.scrollBy(offsetX, offsetY), { offsetX: elementCoordinates.x + offsetX, offsetY: elementCoordinates.y + offsetY });
     } else {
       await this.executeScript(({ offsetX, offsetY }) => window.scrollTo(offsetX, offsetY), { offsetX, offsetY });
@@ -1617,8 +1617,8 @@ class Playwright extends Helper {
     const src = await this._locate(locator);
     assertElementExists(src, locator, 'Slider Element');
 
-    // Note: Using private api ._clickablePoint because the .BoundingBox does not take into account iframe offsets!
-    const sliderSource = await src[0]._clickablePoint();
+    // Note: Using clickablePoint private api because the .BoundingBox does not take into account iframe offsets!
+    const sliderSource = await clickablePoint(src[0]);
 
     // Drag start point
     await this.page.mouse.move(sliderSource.x, sliderSource.y, { steps: 5 });
@@ -2100,7 +2100,14 @@ async function proceedClick(locator, context = null, options = {}) {
   } else {
     assertElementExists(els, locator, 'Clickable element');
   }
-  await els[0].click(options);
+  /*
+    using the force true options itself but instead dispatching a click
+  */
+  if (options.force) {
+    await els[0].dispatchEvent('click');
+  } else {
+    await els[0].click(options);
+  }
   const promises = [];
   if (options.waitForNavigation) {
     promises.push(this.waitForNavigation());
@@ -2222,9 +2229,9 @@ async function proceedDragAndDrop(sourceLocator, destinationLocator, options = {
   const dst = await this._locate(destinationLocator);
   assertElementExists(dst, destinationLocator, 'Destination Element');
 
-  // Note: Using private api ._clickablePoint becaues the .BoundingBox does not take into account iframe offsets!
-  const dragSource = await src[0]._clickablePoint();
-  const dragDestination = await dst[0]._clickablePoint();
+  // Note: Using clickablePoint private api becaues the .BoundingBox does not take into account iframe offsets!
+  const dragSource = await clickablePoint(src[0]);
+  const dragDestination = await clickablePoint(dst[0]);
 
   // Drag start point
   await this.page.mouse.move(dragSource.x, dragSource.y, { steps: 5 });
@@ -2349,10 +2356,20 @@ function $XPath(element, selector) {
 async function targetCreatedHandler(page) {
   if (!page) return;
   this.withinLocator = null;
-  page.on('load', (frame) => {
+  page.on('load', () => {
     page.$('body')
       .catch(() => null)
-      .then(context => this.context = context);
+      .then(async context => {
+        if (this.context._type === 'Frame') {
+          // we are inside iframe?
+          const frameEl = await this.context.frameElement();
+          this.context = await frameEl.contentFrame();
+          return;
+        }
+        // if context element was in iframe - keep it
+        // if (await this.context.ownerFrame()) return;
+        this.context = context;
+      });
   });
   page.on('console', (msg) => {
     this.debugSection(`Browser:${ucfirst(msg.type())}`, (msg._text || '') + msg.args().join(' '));
@@ -2435,3 +2452,12 @@ function getNormalizedKey(key) {
   }
   return normalizedKey;
 }
+
+async function clickablePoint(el) {
+  const rect = await el.boundingBox();
+  if (!rect) throw new ElementNotFound(el);
+  const {
+    x, y, width, height,
+  } = rect;
+  return { x: x + width / 2, y: y + height / 2 };
+}

package/lib/helper/Protractor.js

@@ -10,8 +10,8 @@ const requireg = require('requireg');
 const Helper = require('../helper');
 const stringIncludes = require('../assert/include').includes;
 const { urlEquals, equals } = require('../assert/equal');
-const empty = require('../assert/empty').empty;
-const truth = require('../assert/truth').truth;
+const { empty } = require('../assert/empty');
+const { truth } = require('../assert/truth');
 const {
   xpathLocator,
   fileExists,

package/lib/helper/WebDriver.js

@@ -1839,12 +1839,24 @@ class WebDriver extends Helper {
 
     // for chrome
     if (browser.isW3C) {
-      return browser.performActions([
-        { type: 'pointerDown', button: 0 },
-        {
-          type: 'pointerMove', origin: 'pointer', duration: 1000, x: offsetX, y: 0,
-        },
-        { type: 'pointerUp', button: 0 },
+      const xOffset = await this.grabElementBoundingRect(locator, 'x');
+      const yOffset = await this.grabElementBoundingRect(locator, 'y');
+
+      return browser.performActions([{
+        type: 'pointer',
+        id: 'pointer1',
+        parameters: { pointerType: 'mouse' },
+        actions: [
+          {
+            type: 'pointerMove', origin: 'pointer', duration: 1000, x: xOffset, y: yOffset,
+          },
+          { type: 'pointerDown', button: 0 },
+          {
+            type: 'pointerMove', origin: 'pointer', duration: 1000, x: offsetX, y: 0,
+          },
+          { type: 'pointerUp', button: 0 },
+        ],
+      },
       ]);
     }
 

package/lib/helper/clientscripts/PollyWebDriverExt.js

@@ -55,7 +55,7 @@ const pollyWebDriver = {
         throw new Error(`Invalid value for baseUrl: ${baseUrl}`);
       }
       if (!(typeof oneOrMoreUrls === 'string' || Array.isArray(oneOrMoreUrls))) {
-        throw new Error(`Expected type of Urls is 'string' or 'array', Found '${typeof oneOrMoreUrls}'.`);
+        throw new Error(`Expected type of URLs is 'string' or 'array', found '${typeof oneOrMoreUrls}'.`);
       }
       // Remove '/' if it's at the end of baseUrl
       const lastChar = baseUrl.substr(-1);

package/lib/hooks.js

@@ -1,7 +1,6 @@
 const fsPath = require('path');
 
-const getParamNames = require('./utils').getParamNames;
-const fileExists = require('./utils').fileExists;
+const { getParamNames, fileExists } = require('./utils');
 const output = require('./output');
 
 module.exports = function (hook, done, stage) {

package/lib/interfaces/gherkin.js

@@ -2,7 +2,6 @@ const { Parser } = require('gherkin');
 const { Context, Suite, Test } = require('mocha');
 
 const { matchStep } = require('./bdd');
-const { isAsyncFunction } = require('../utils');
 const event = require('../event');
 const scenario = require('../scenario');
 const Step = require('../step');

package/lib/listener/helpers.js

@@ -2,8 +2,7 @@ const event = require('../event');
 const container = require('../container');
 const recorder = require('../recorder');
 const store = require('../store');
-const error = require('../output').error;
-const { deepMerge } = require('../utils');
+const { error } = require('../output');
 /**
  * Enable Helpers to listen to test events
  */

package/lib/listener/mocha.js

@@ -1,7 +1,6 @@
 const event = require('../event');
 const container = require('../container');
 const recorder = require('../recorder');
-const error = require('../output').error;
 
 module.exports = function () {
   let mocha;

package/lib/locator.js

@@ -1,7 +1,7 @@
 const cssToXPath = require('css-to-xpath');
-const sprintf = require('sprintf-js').sprintf;
+const { sprintf } = require('sprintf-js');
 
-const xpathLocator = require('./utils').xpathLocator;
+const { xpathLocator } = require('./utils');
 
 const locatorTypes = ['css', 'by', 'xpath', 'id', 'name', 'fuzzy', 'frame'];
 /** @class */

package/lib/pause.js

@@ -7,7 +7,7 @@ const store = require('./store');
 const recorder = require('./recorder');
 const event = require('./event');
 const output = require('./output');
-const methodsOfObject = require('./utils').methodsOfObject;
+const { methodsOfObject } = require('./utils');
 
 // npm install colors
 let rl;

package/lib/plugin/allure.js

@@ -2,7 +2,7 @@ const Allure = require('allure-js-commons');
 
 const event = require('../event');
 const logger = require('../output');
-const ansiRegExp = require('../utils').ansiRegExp;
+const { ansiRegExp } = require('../utils');
 
 const defaultConfig = {
   outputDir: global.output_dir,

package/lib/plugin/autoDelay.js

@@ -2,8 +2,8 @@ const Container = require('../container');
 const store = require('../store');
 const recorder = require('../recorder');
 const event = require('../event');
-const log = require('../output').log;
-const supportedHelpers = require('./standardActingHelpers');
+const { log } = require('../output');
+const supportedHelpers = require('./standardActingHelpers').slice();
 
 const methodsToDelay = [
   'click',

package/lib/plugin/autoLogin.js

@@ -4,7 +4,7 @@ const { fileExists } = require('../utils');
 const container = require('../container');
 const store = require('../store');
 const recorder = require('../recorder');
-const debug = require('../output').debug;
+const { debug } = require('../output');
 const isAsyncFunction = require('../utils').isAsyncFunction;
 
 const defaultUser = {

package/lib/plugin/standardActingHelpers.js

@@ -1,7 +1,5 @@
 const standardActingHelpers = [
-  'Mochawesome',
   'WebDriver',
-  'WebDriverIO',
   'Protractor',
   'Appium',
   'Nightmare',

package/lib/recorder.js

@@ -1,7 +1,7 @@
 const debug = require('debug')('codeceptjs');
 const promiseRetry = require('promise-retry');
 
-const log = require('./output').log;
+const { log } = require('./output');
 
 let promise;
 let running = false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeceptjs",
-  "version": "2.6.10",
+  "version": "2.6.11",
   "description": "Supercharged End 2 End Testing Framework for NodeJS",
   "keywords": [
     "acceptance",
@@ -9,6 +9,7 @@
     "puppeteer",
     "webdriver",
     "testcafe",
+    "playwright",
     "protractor",
     "bdd",
     "tdd",
@@ -110,7 +111,7 @@
     "mocha-parallel-tests": "^2.3.0",
     "nightmare": "^3.0.2",
     "nodemon": "^1.19.4",
-    "playwright": "^1.1.1",
+    "playwright": "^1.4.0",
     "protractor": "^5.4.4",
     "puppeteer": "^4.0.0",
     "qrcode-terminal": "^0.12.0",