codeceptjs 3.5.12-beta.3 → 3.5.12-beta.6

package/lib/helper/Playwright.js

@@ -47,6 +47,9 @@ const {
   setRestartStrategy, restartsSession, restartsContext, restartsBrowser,
 } = require('./extras/PlaywrightRestartOpts');
 const { createValueEngine, createDisabledEngine } = require('./extras/PlaywrightPropEngine');
+const {
+  seeElementError, dontSeeElementError, dontSeeElementInDOMError, seeElementInDOMError,
+} = require('./errors/ElementAssertion');
 
 const pathSeparator = path.sep;
 
@@ -1451,7 +1454,11 @@ class Playwright extends Helper {
   async seeElement(locator) {
     let els = await this._locate(locator);
     els = await Promise.all(els.map(el => el.isVisible()));
-    return empty('visible elements').negate(els.filter(v => v).fill('ELEMENT'));
+    try {
+      return empty('visible elements').negate(els.filter(v => v).fill('ELEMENT'));
+    } catch (e) {
+      dontSeeElementError(locator);
+    }
   }
 
   /**
@@ -1461,7 +1468,11 @@ class Playwright extends Helper {
   async dontSeeElement(locator) {
     let els = await this._locate(locator);
     els = await Promise.all(els.map(el => el.isVisible()));
-    return empty('visible elements').assert(els.filter(v => v).fill('ELEMENT'));
+    try {
+      return empty('visible elements').assert(els.filter(v => v).fill('ELEMENT'));
+    } catch (e) {
+      seeElementError(locator);
+    }
   }
 
   /**
@@ -1469,7 +1480,11 @@ class Playwright extends Helper {
    */
   async seeElementInDOM(locator) {
     const els = await this._locate(locator);
-    return empty('elements on page').negate(els.filter(v => v).fill('ELEMENT'));
+    try {
+      return empty('elements on page').negate(els.filter(v => v).fill('ELEMENT'));
+    } catch (e) {
+      dontSeeElementInDOMError(locator);
+    }
   }
 
   /**
@@ -1477,7 +1492,11 @@ class Playwright extends Helper {
    */
   async dontSeeElementInDOM(locator) {
     const els = await this._locate(locator);
-    return empty('elements on a page').assert(els.filter(v => v).fill('ELEMENT'));
+    try {
+      return empty('elements on a page').assert(els.filter(v => v).fill('ELEMENT'));
+    } catch (e) {
+      seeElementInDOMError(locator);
+    }
   }
 
   /**
@@ -2974,27 +2993,27 @@ class Playwright extends Helper {
       throw new Error('Failure in test automation. You use "I.grabRecordedNetworkTraffics", but "I.startRecordingTraffic" was never called before.');
     }
 
-    const requests = await this.requests;
-    const promises = requests.map(async (request) => request.response.then(
-      async (response) => {
-        let body;
-        try {
-          // There's no 'body' for some requests (redirect etc...)
-          body = JSON.parse((await response.body()).toString());
-        } catch (e) {
-          // only interested in JSON, not HTML responses.
-        }
+    const promises = this.requests.map(async (request) => {
+      const resp = await request.response;
+      let body;
+      try {
+        // There's no 'body' for some requests (redirect etc...)
+        body = JSON.parse((await resp.body()).toString());
+      } catch (e) {
+        // only interested in JSON, not HTML responses.
+      }
 
-        request.response = {
-          status: response.status(),
-          statusText: response.statusText(),
+      return {
+        url: resp.url(),
+        response: {
+          status: resp.status(),
+          statusText: resp.statusText(),
           body,
-        };
-      },
-    ));
-    await Promise.all(promises);
+        },
+      };
+    });
 
-    return this.requests;
+    return Promise.all(promises);
   }
 
   /**

package/lib/helper/Puppeteer.js

@@ -39,6 +39,9 @@ const findReact = require('./extras/React');
 const { highlightElement } = require('./scripts/highlightElement');
 const { blurElement } = require('./scripts/blurElement');
 const { focusElement } = require('./scripts/focusElement');
+const {
+  dontSeeElementError, seeElementError, dontSeeElementInDOMError, seeElementInDOMError,
+} = require('./errors/ElementAssertion');
 
 let puppeteer;
 let perfTiming;
@@ -1038,8 +1041,11 @@ class Puppeteer extends Helper {
     els = (await Promise.all(els.map(el => el.boundingBox() && el))).filter(v => v);
     // Puppeteer visibility was ignored? | Remove when Puppeteer is fixed
     els = await Promise.all(els.map(async el => (await el.evaluate(node => window.getComputedStyle(node).visibility !== 'hidden' && window.getComputedStyle(node).display !== 'none')) && el));
-
-    return empty('visible elements').negate(els.filter(v => v).fill('ELEMENT'));
+    try {
+      return empty('visible elements').negate(els.filter(v => v).fill('ELEMENT'));
+    } catch (e) {
+      dontSeeElementError(locator);
+    }
   }
 
   /**
@@ -1051,8 +1057,11 @@ class Puppeteer extends Helper {
     els = (await Promise.all(els.map(el => el.boundingBox() && el))).filter(v => v);
     // Puppeteer visibility was ignored? | Remove when Puppeteer is fixed
     els = await Promise.all(els.map(async el => (await el.evaluate(node => window.getComputedStyle(node).visibility !== 'hidden' && window.getComputedStyle(node).display !== 'none')) && el));
-
-    return empty('visible elements').assert(els.filter(v => v).fill('ELEMENT'));
+    try {
+      return empty('visible elements').assert(els.filter(v => v).fill('ELEMENT'));
+    } catch (e) {
+      seeElementError(locator);
+    }
   }
 
   /**
@@ -1060,7 +1069,11 @@ class Puppeteer extends Helper {
    */
   async seeElementInDOM(locator) {
     const els = await this._locate(locator);
-    return empty('elements on page').negate(els.filter(v => v).fill('ELEMENT'));
+    try {
+      return empty('elements on page').negate(els.filter(v => v).fill('ELEMENT'));
+    } catch (e) {
+      dontSeeElementInDOMError(locator);
+    }
   }
 
   /**
@@ -1068,7 +1081,11 @@ class Puppeteer extends Helper {
    */
   async dontSeeElementInDOM(locator) {
     const els = await this._locate(locator);
-    return empty('elements on a page').assert(els.filter(v => v).fill('ELEMENT'));
+    try {
+      return empty('elements on a page').assert(els.filter(v => v).fill('ELEMENT'));
+    } catch (e) {
+      seeElementInDOMError(locator);
+    }
   }
 
   /**

package/lib/helper/WebDriver.js

@@ -32,6 +32,9 @@ const { highlightElement } = require('./scripts/highlightElement');
 const store = require('../store');
 const { focusElement } = require('./scripts/focusElement');
 const { blurElement } = require('./scripts/blurElement');
+const {
+  dontSeeElementError, seeElementError, seeElementInDOMError, dontSeeElementInDOMError,
+} = require('./errors/ElementAssertion');
 
 const SHADOW = 'shadow';
 const webRoot = 'body';
@@ -1461,7 +1464,11 @@ class WebDriver extends Helper {
     const res = await this._locate(locator, true);
     assertElementExists(res, locator);
     const selected = await forEachAsync(res, async el => el.isDisplayed());
-    return truth(`elements of ${(new Locator(locator))}`, 'to be seen').assert(selected);
+    try {
+      return truth(`elements of ${(new Locator(locator))}`, 'to be seen').assert(selected);
+    } catch (e) {
+      dontSeeElementError(locator);
+    }
   }
 
   /**
@@ -1474,7 +1481,11 @@ class WebDriver extends Helper {
       return truth(`elements of ${(new Locator(locator))}`, 'to be seen').negate(false);
     }
     const selected = await forEachAsync(res, async el => el.isDisplayed());
-    return truth(`elements of ${(new Locator(locator))}`, 'to be seen').negate(selected);
+    try {
+      return truth(`elements of ${(new Locator(locator))}`, 'to be seen').negate(selected);
+    } catch (e) {
+      seeElementError(locator);
+    }
   }
 
   /**
@@ -1483,7 +1494,11 @@ class WebDriver extends Helper {
    */
   async seeElementInDOM(locator) {
     const res = await this._res(locator);
-    return empty('elements').negate(res);
+    try {
+      return empty('elements').negate(res);
+    } catch (e) {
+      dontSeeElementInDOMError(locator);
+    }
   }
 
   /**
@@ -1492,7 +1507,11 @@ class WebDriver extends Helper {
    */
   async dontSeeElementInDOM(locator) {
     const res = await this._res(locator);
-    return empty('elements').assert(res);
+    try {
+      return empty('elements').assert(res);
+    } catch (e) {
+      seeElementInDOMError(locator);
+    }
   }
 
   /**

package/lib/helper/errors/ElementAssertion.js

@@ -0,0 +1,38 @@
+const Locator = require('../../locator');
+
+const prefixMessage = 'Element';
+
+function seeElementError(locator) {
+  if (typeof locator === 'object') {
+    locator = JSON.stringify(locator);
+  }
+  throw new Error(`${prefixMessage} "${(new Locator(locator))}" is still visible on page.`);
+}
+
+function seeElementInDOMError(locator) {
+  if (typeof locator === 'object') {
+    locator = JSON.stringify(locator);
+  }
+  throw new Error(`${prefixMessage} "${(new Locator(locator))}" is still seen in DOM.`);
+}
+
+function dontSeeElementError(locator) {
+  if (typeof locator === 'object') {
+    locator = JSON.stringify(locator);
+  }
+  throw new Error(`${prefixMessage} "${(new Locator(locator))}" is not visible on page.`);
+}
+
+function dontSeeElementInDOMError(locator) {
+  if (typeof locator === 'object') {
+    locator = JSON.stringify(locator);
+  }
+  throw new Error(`${prefixMessage} "${(new Locator(locator))}" is not seen in DOM.`);
+}
+
+module.exports = {
+  seeElementError,
+  dontSeeElementError,
+  seeElementInDOMError,
+  dontSeeElementInDOMError,
+};

package/lib/locator.js

@@ -1,4 +1,4 @@
-let cssToXPath;
+const cssToXPath = require('csstoxpath');
 const { sprintf } = require('sprintf-js');
 
 const { xpathLocator } = require('./utils');
@@ -162,17 +162,8 @@ class Locator {
    * @returns {string}
    */
   toXPath(pseudoSelector = '') {
-    const locator = `${this.value}${pseudoSelector}`;
-    const limitation = [':nth-of-type', ':first-of-type', ':last-of-type', ':nth-last-child', ':nth-last-of-type', ':checked', ':disabled', ':enabled', ':required', ':lang'];
-
-    if (limitation.some(item => locator.includes(item))) {
-      cssToXPath = require('css-to-xpath');
-    } else {
-      cssToXPath = require('csstoxpath');
-    }
-
     if (this.isXPath()) return this.value;
-    if (this.isCSS()) return cssToXPath(locator);
+    if (this.isCSS()) return cssToXPath(`${this.value}${pseudoSelector}`);
 
     throw new Error('Can\'t be converted to XPath');
   }
@@ -259,7 +250,7 @@ class Locator {
    */
   withText(text) {
     text = xpathLocator.literal(text);
-    const xpath = sprintf('%s[%s]', this.toXPath(), `contains(., ${text})`);
+    const xpath = this.toXPath(`:text-contains-case(${text})`);
     return new Locator({ xpath });
   }
 
@@ -270,7 +261,7 @@ class Locator {
    */
   withTextEquals(text) {
     text = xpathLocator.literal(text);
-    const xpath = sprintf('%s[%s]', this.toXPath(), `.= ${text}`);
+    const xpath = this.toXPath(`:text-case(${text})`);
     return new Locator({ xpath });
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeceptjs",
-  "version": "3.5.12-beta.3",
+  "version": "3.5.12-beta.6",
   "description": "Supercharged End 2 End Testing Framework for NodeJS",
   "keywords": [
     "acceptance",
@@ -76,15 +76,14 @@
     "axios": "1.6.3",
     "chai": "4.3.8",
     "chai-deep-match": "1.2.1",
-    "chai-exclude": "2.1.0",
-    "chai-json-schema": "1.5.1",
-    "chai-json-schema-ajv": "5.2.4",
-    "chai-match-pattern": "1.3.0",
-    "chai-string": "1.5.0",
+    "chai-exclude": "^2.1.0",
+    "chai-json-schema": "^1.5.1",
+    "chai-json-schema-ajv": "^5.2.4",
+    "chai-match-pattern": "^1.3.0",
+    "chai-string": "^1.5.0",
     "chalk": "4.1.2",
     "commander": "11.1.0",
     "cross-spawn": "7.0.3",
-    "css-to-xpath": "0.1.0",
     "csstoxpath": "1.6.0",
     "devtools": "8.27.2",
     "envinfo": "7.11.0",
@@ -93,7 +92,7 @@
     "fn-args": "4.0.0",
     "fs-extra": "11.2.0",
     "glob": "6.0.1",
-    "html-minifier-terser": "7.2.0",
+    "html-minifier-terser": "^7.2.0",
     "inquirer": "6.5.2",
     "joi": "17.11.0",
     "js-beautify": "1.14.11",
@@ -119,7 +118,7 @@
     "@faker-js/faker": "7.6.0",
     "@pollyjs/adapter-puppeteer": "6.0.6",
     "@pollyjs/core": "5.1.0",
-    "@types/chai": "4.3.7",
+    "@types/chai": "^4.3.7",
     "@types/inquirer": "9.0.3",
     "@types/node": "20.10.7",
     "@wdio/sauce-service": "8.27.0",