expect-webdriverio 5.2.2 → 5.3.1

package/lib/matchers/element/toHaveHeight.js

@@ -1,10 +1,10 @@
 import { DEFAULT_OPTIONS } from '../../constants.js';
-import { enhanceError, executeCommand, waitUntil, wrapExpectedWithArray } from '../../utils.js';
-async function condition(el, height) {
+import { compareNumbers, enhanceError, executeCommand, numberError, waitUntil, } from '../../utils.js';
+async function condition(el, height, options) {
     const actualHeight = await el.getSize('height');
     return {
-        value: actualHeight,
-        result: actualHeight === height,
+        result: compareNumbers(actualHeight, options),
+        value: actualHeight
     };
 }
 export async function toHaveHeight(received, expectedValue, options = DEFAULT_OPTIONS) {
@@ -15,15 +15,26 @@ export async function toHaveHeight(received, expectedValue, options = DEFAULT_OP
         expectedValue,
         options,
     });
+    let numberOptions;
+    if (typeof expectedValue === 'number') {
+        numberOptions = { eq: expectedValue };
+    }
+    else if (!expectedValue || (typeof expectedValue.eq !== 'number' && typeof expectedValue.gte !== 'number' && typeof expectedValue.lte !== 'number')) {
+        throw new Error('Invalid params passed to toHaveHeight.');
+    }
+    else {
+        numberOptions = expectedValue;
+    }
     let el = await received?.getElement();
     let actualHeight;
     const pass = await waitUntil(async () => {
-        const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);
+        const result = await executeCommand.call(this, el, condition, numberOptions, [expectedValue, numberOptions]);
         el = result.el;
         actualHeight = result.values;
         return result.success;
-    }, isNot, options);
-    const message = enhanceError(el, wrapExpectedWithArray(el, actualHeight, expectedValue), actualHeight, this, verb, expectation, '', options);
+    }, isNot, { ...numberOptions, ...options });
+    const error = numberError(numberOptions);
+    const message = enhanceError(el, error, actualHeight, this, verb, expectation, '', options);
     const result = {
         pass,
         message: () => message

package/lib/matchers/element/toHaveWidth.js

@@ -1,10 +1,10 @@
 import { DEFAULT_OPTIONS } from '../../constants.js';
-import { enhanceError, executeCommand, waitUntil, wrapExpectedWithArray } from '../../utils.js';
-async function condition(el, width) {
+import { compareNumbers, enhanceError, executeCommand, numberError, waitUntil, } from '../../utils.js';
+async function condition(el, width, options) {
     const actualWidth = await el.getSize('width');
     return {
-        value: actualWidth,
-        result: actualWidth === width,
+        result: compareNumbers(actualWidth, options),
+        value: actualWidth
     };
 }
 export async function toHaveWidth(received, expectedValue, options = DEFAULT_OPTIONS) {
@@ -15,15 +15,26 @@ export async function toHaveWidth(received, expectedValue, options = DEFAULT_OPT
         expectedValue,
         options,
     });
+    let numberOptions;
+    if (typeof expectedValue === 'number') {
+        numberOptions = { eq: expectedValue };
+    }
+    else if (!expectedValue || (typeof expectedValue.eq !== 'number' && typeof expectedValue.gte !== 'number' && typeof expectedValue.lte !== 'number')) {
+        throw new Error('Invalid params passed to toHaveHeight.');
+    }
+    else {
+        numberOptions = expectedValue;
+    }
     let el = await received?.getElement();
     let actualWidth;
     const pass = await waitUntil(async () => {
-        const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);
+        const result = await executeCommand.call(this, el, condition, numberOptions, [expectedValue, numberOptions]);
         el = result.el;
         actualWidth = result.values;
         return result.success;
-    }, isNot, options);
-    const message = enhanceError(el, wrapExpectedWithArray(el, actualWidth, expectedValue), actualWidth, this, verb, expectation, '', options);
+    }, isNot, { ...numberOptions, ...options });
+    const error = numberError(numberOptions);
+    const message = enhanceError(el, error, actualWidth, this, verb, expectation, '', options);
     const result = {
         pass,
         message: () => message

package/lib/matchers/snapshot.js

@@ -1,5 +1,6 @@
 import path from 'node:path';
 import { expect } from 'expect';
+import { stripSnapshotIndentation } from '@vitest/snapshot';
 import { SnapshotService } from '../snapshot.js';
 function returnSnapshotError(snapshotError) {
     try {
@@ -73,9 +74,16 @@ export function toMatchInlineSnapshot(received, inlineSnapshot, message) {
                 ...stack.slice(3)
             ].join('\n');
         }
-        error.stack = error.stack?.split('\n').filter((line) => (line.includes('__INLINE_SNAPSHOT__') ||
+        const trace = error.stack?.split('\n').filter((line) => (line.includes('__INLINE_SNAPSHOT__') ||
             !(line.includes('__EXTERNAL_MATCHER_TRAP__') ||
-                line.includes(`expect-webdriverio${path.sep}lib${path.sep}matchers${path.sep}snapshot.js:`)))).join('\n');
+                line.includes(`expect-webdriverio${path.sep}lib${path.sep}matchers${path.sep}snapshot.js:`)))) || [];
+        if (process.env.WDIO_INTERNAL_TEST) {
+            trace.splice(2, 1);
+        }
+        if (inlineSnapshot) {
+            inlineSnapshot = stripSnapshotIndentation(inlineSnapshot);
+        }
+        error.stack = trace.join('\n');
         return toMatchSnapshotHelper(received, message, {
             inlineSnapshot,
             error

package/lib/snapshot.js

@@ -43,9 +43,15 @@ export class SnapshotService {
             : options?.updateState
                 ? options.updateState
                 : 'new';
+        const snapshotFormatConfig = options?.snapshotFormat ? {
+            printBasicPrototype: false,
+            escapeString: false,
+            ...options.snapshotFormat
+        } : undefined;
         __classPrivateFieldSet(this, _SnapshotService_options, {
             updateSnapshot,
-            snapshotEnvironment: new WebdriverIOSnapshotEnvironment(options?.resolveSnapshotPath)
+            snapshotEnvironment: new WebdriverIOSnapshotEnvironment(options?.resolveSnapshotPath),
+            ...(snapshotFormatConfig && { snapshotFormat: snapshotFormatConfig })
         }, "f");
     }
     get currentFilePath() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "5.2.2",
+  "version": "5.3.1",
   "author": "Mykola Grybyk <mykola.grybyk@gmail.com>",
   "description": "WebdriverIO Assertion Library",
   "license": "MIT",
@@ -58,28 +58,28 @@
     "prepare": "husky install"
   },
   "dependencies": {
-    "@vitest/snapshot": "^3.2.1",
-    "expect": "^29.7.0",
-    "jest-matcher-utils": "^29.7.0",
+    "@vitest/snapshot": "^3.2.4",
+    "expect": "^30.0.0",
+    "jest-matcher-utils": "^30.0.0",
     "lodash.isequal": "^4.5.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.14",
+    "@types/jest": "^30.0.0",
     "@types/lodash.isequal": "^4.5.8",
-    "@types/node": "^22.15.29",
-    "@vitest/coverage-v8": "^3.2.1",
+    "@types/node": "^24.0.3",
+    "@vitest/coverage-v8": "^3.2.4",
     "@wdio/eslint": "^0.1.1",
     "@wdio/types": "^9.15.0",
     "c8": "^10.1.3",
-    "eslint": "^9.28.0",
+    "eslint": "^9.29.0",
     "husky": "^9.1.7",
     "npm-run-all2": "^8.0.4",
     "release-it": "^19.0.3",
     "rimraf": "^6.0.1",
     "shelljs": "^0.10.0",
     "typescript": "^5.8.3",
-    "vitest": "^3.2.1",
+    "vitest": "^3.2.4",
     "webdriverio": "^9.15.0"
   },
   "peerDependencies": {