expect-webdriverio 5.0.0-alpha.0 → 5.0.0-alpha.2

package/lib/matchers/browser/toHaveClipboardText.js

@@ -30,9 +30,3 @@ export async function toHaveClipboardText(browser, expectedValue, options = DEFA
     });
     return result;
 }
-export function toHaveClipboardTextContaining(browser, clipboardText, options = {}) {
-    return toHaveClipboardText.call(this, browser, clipboardText, {
-        ...options,
-        containing: true
-    });
-}

package/lib/matchers/browser/toHaveTitle.js

@@ -26,9 +26,3 @@ export async function toHaveTitle(browser, expectedValue, options = DEFAULT_OPTI
     });
     return result;
 }
-export function toHaveTitleContaining(browser, title, options = {}) {
-    return toHaveTitle.call(this, browser, title, {
-        ...options,
-        containing: true
-    });
-}

package/lib/matchers/browser/toHaveUrl.js

@@ -26,9 +26,3 @@ export async function toHaveUrl(browser, expectedValue, options = DEFAULT_OPTION
     });
     return result;
 }
-export function toHaveUrlContaining(browser, url, options = DEFAULT_OPTIONS) {
-    return toHaveUrl.call(this, browser, url, {
-        ...options,
-        containing: true
-    });
-}

package/lib/matchers/element/toHaveAttribute.js

@@ -19,7 +19,7 @@ async function conditionAttrAndValue(el, attribute, value, options) {
 export async function toHaveAttributeAndValue(received, attribute, value, options = DEFAULT_OPTIONS) {
     const isNot = this.isNot;
     const { expectation = 'attribute', verb = 'have' } = this;
-    let el = await received;
+    let el = await received.getElement();
     let attr;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, conditionAttrAndValue, options, [attribute, value, options]);
@@ -66,11 +66,4 @@ export async function toHaveAttribute(received, attribute, value, options = DEFA
     });
     return result;
 }
-export function toHaveAttributeContaining(el, attribute, value, options = DEFAULT_OPTIONS) {
-    return toHaveAttributeAndValue.call(this, el, attribute, value, {
-        ...options,
-        containing: true
-    });
-}
-export const toHaveAttrContaining = toHaveAttributeContaining;
 export const toHaveAttr = toHaveAttribute;

package/lib/matchers/element/toHaveChildren.js

@@ -1,7 +1,7 @@
 import { DEFAULT_OPTIONS } from '../../constants.js';
 import { compareNumbers, enhanceError, executeCommand, numberError, waitUntil, wrapExpectedWithArray } from '../../utils.js';
 async function condition(el, options) {
-    const children = await el.$$('./*');
+    const children = await el.$$('./*').getElements();
     if (typeof options.lte !== 'number' &&
         typeof options.gte !== 'number' &&
         typeof options.eq !== 'number') {
@@ -26,7 +26,7 @@ export async function toHaveChildren(received, expectedValue, options = DEFAULT_
     const numberOptions = typeof expectedValue === 'number'
         ? { eq: expectedValue }
         : expectedValue || {};
-    let el = await received;
+    let el = await received.getElement();
     let children;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, numberOptions, [numberOptions]);

package/lib/matchers/element/toHaveClass.js

@@ -32,7 +32,7 @@ export async function toHaveElementClass(received, expectedValue, options = DEFA
         options,
     });
     const attribute = 'class';
-    let el = await received;
+    let el = await received.getElement();
     let attr;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [attribute, expectedValue, options]);
@@ -53,9 +53,6 @@ export async function toHaveElementClass(received, expectedValue, options = DEFA
     });
     return result;
 }
-export function toHaveElementClassContaining(...args) {
-    return toHaveClassContaining.call(this, ...args);
-}
 export function toHaveClassContaining(el, className, options = DEFAULT_OPTIONS) {
     return toHaveAttributeAndValue.call(this, el, 'class', className, {
         ...options,

package/lib/matchers/element/toHaveComputedLabel.js

@@ -15,7 +15,7 @@ export async function toHaveComputedLabel(received, expectedValue, options = DEF
         expectedValue,
         options,
     });
-    let el = await received;
+    let el = await received.getElement();
     let actualLabel;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);
@@ -36,9 +36,3 @@ export async function toHaveComputedLabel(received, expectedValue, options = DEF
     });
     return result;
 }
-export function toHaveComputedLabelContaining(el, label, options = DEFAULT_OPTIONS) {
-    return toHaveComputedLabel.call(this, el, label, {
-        ...options,
-        containing: true
-    });
-}

package/lib/matchers/element/toHaveComputedRole.js

@@ -15,7 +15,7 @@ export async function toHaveComputedRole(received, expectedValue, options = DEFA
         expectedValue,
         options,
     });
-    let el = await received;
+    let el = await received.getElement();
     let actualRole;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);
@@ -36,9 +36,3 @@ export async function toHaveComputedRole(received, expectedValue, options = DEFA
     });
     return result;
 }
-export function toHaveComputedRoleContaining(el, role, options = DEFAULT_OPTIONS) {
-    return toHaveComputedRole.call(this, el, role, {
-        ...options,
-        containing: true
-    });
-}

package/lib/matchers/element/toHaveElementProperty.js

@@ -23,7 +23,7 @@ export async function toHaveElementProperty(received, property, value, options =
         expectedValue: [property, value],
         options,
     });
-    let el = await received;
+    let el = await received.getElement();
     let prop;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [property, value]);

package/lib/matchers/element/toHaveHTML.js

@@ -1,7 +1,7 @@
 import { DEFAULT_OPTIONS } from '../../constants.js';
 import { compareText, compareTextWithArray, enhanceError, executeCommand, waitUntil, wrapExpectedWithArray } from '../../utils.js';
 async function condition(el, html, options) {
-    const actualHTML = await el.getHTML(options.includeSelectorTag);
+    const actualHTML = await el.getHTML(options);
     if (Array.isArray(html)) {
         return compareTextWithArray(actualHTML, html, options);
     }
@@ -15,7 +15,11 @@ export async function toHaveHTML(received, expectedValue, options = DEFAULT_OPTI
         expectedValue,
         options,
     });
-    let el = await received;
+    let el = 'getElement' in received
+        ? await received.getElement()
+        : 'getElements' in received
+            ? await received.getElements()
+            : received;
     let actualHTML;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);
@@ -36,9 +40,3 @@ export async function toHaveHTML(received, expectedValue, options = DEFAULT_OPTI
     });
     return result;
 }
-export function toHaveHTMLContaining(el, html, options = DEFAULT_OPTIONS) {
-    return toHaveHTML.call(this, el, html, {
-        ...options,
-        containing: true
-    });
-}

package/lib/matchers/element/toHaveHeight.js

@@ -15,7 +15,7 @@ export async function toHaveHeight(received, expectedValue, options = DEFAULT_OP
         expectedValue,
         options,
     });
-    let el = await received;
+    let el = await received.getElement();
     let actualHeight;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/element/toHaveHref.js

@@ -16,10 +16,3 @@ export async function toHaveHref(el, expectedValue, options = DEFAULT_OPTIONS) {
     return result;
 }
 export const toHaveLink = toHaveHref;
-export function toHaveHrefContaining(el, href, options = DEFAULT_OPTIONS) {
-    return toHaveHref.call(this, el, href, {
-        ...options,
-        containing: true
-    });
-}
-export const toHaveLinkContaining = toHaveHrefContaining;

package/lib/matchers/element/toHaveSize.js

@@ -12,7 +12,7 @@ export async function toHaveSize(received, expectedValue, options = DEFAULT_OPTI
         expectedValue,
         options,
     });
-    let el = await received;
+    let el = await received.getElement();
     let actualSize;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/element/toHaveStyle.js

@@ -11,7 +11,7 @@ export async function toHaveStyle(received, expectedValue, options = DEFAULT_OPT
         expectedValue,
         options,
     });
-    let el = await received;
+    let el = await received.getElement();
     let actualStyle;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/element/toHaveText.js

@@ -35,7 +35,11 @@ export async function toHaveText(received, expectedValue, options = DEFAULT_OPTI
         expectedValue,
         options,
     });
-    let el = await received;
+    let el = 'getElement' in received
+        ? await received.getElement()
+        : 'getElements' in received
+            ? await received.getElements()
+            : received;
     let actualText;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);
@@ -56,9 +60,3 @@ export async function toHaveText(received, expectedValue, options = DEFAULT_OPTI
     });
     return result;
 }
-export function toHaveTextContaining(el, text, options = DEFAULT_OPTIONS) {
-    return toHaveText.call(this, el, text, {
-        ...options,
-        containing: true
-    });
-}

package/lib/matchers/element/toHaveValue.js

@@ -3,9 +3,3 @@ import { DEFAULT_OPTIONS } from '../../constants.js';
 export function toHaveValue(el, value, options = DEFAULT_OPTIONS) {
     return toHaveElementProperty.call(this, el, 'value', value, options);
 }
-export function toHaveValueContaining(el, value, options = DEFAULT_OPTIONS) {
-    return toHaveValue.call(this, el, value, {
-        ...options,
-        containing: true
-    });
-}

package/lib/matchers/element/toHaveWidth.js

@@ -15,7 +15,7 @@ export async function toHaveWidth(received, expectedValue, options = DEFAULT_OPT
         expectedValue,
         options,
     });
-    let el = await received;
+    let el = await received.getElement();
     let actualWidth;
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, condition, options, [expectedValue, options]);

package/lib/matchers/mock/toBeRequestedWith.js

@@ -3,6 +3,12 @@ import { equals } from '../../jasmineUtils.js';
 import { DEFAULT_OPTIONS } from '../../constants.js';
 const STR_LIMIT = 80;
 const KEY_LIMIT = 12;
+function reduceHeaders(headers) {
+    return Object.entries(headers).reduce((acc, [, value]) => {
+        acc[value.name] = value.value.value;
+        return acc;
+    }, {});
+}
 export async function toBeRequestedWith(received, expectedValue = {}, options = DEFAULT_OPTIONS) {
     const isNot = this.isNot || false;
     const { expectation = 'called with', verb = 'be' } = this;
@@ -15,13 +21,11 @@ export async function toBeRequestedWith(received, expectedValue = {}, options =
     const pass = await waitUntil(async () => {
         for (const call of received.calls) {
             actual = call;
-            if (methodMatcher(call.method, expectedValue.method) &&
-                statusCodeMatcher(call.statusCode, expectedValue.statusCode) &&
-                urlMatcher(call.url, expectedValue.url) &&
-                headersMatcher(call.headers, expectedValue.requestHeaders) &&
-                headersMatcher(call.responseHeaders, expectedValue.responseHeaders) &&
-                bodyMatcher(call.postData, expectedValue.postData) &&
-                bodyMatcher(call.body, expectedValue.response)) {
+            if (methodMatcher(call.request.method, expectedValue.method) &&
+                statusCodeMatcher(call.response.status, expectedValue.statusCode) &&
+                urlMatcher(call.request.url, expectedValue.url) &&
+                headersMatcher(reduceHeaders(call.request.headers), expectedValue.requestHeaders) &&
+                headersMatcher(reduceHeaders(call.response.headers), expectedValue.responseHeaders)) {
                 return true;
             }
         }
@@ -75,7 +79,8 @@ const urlMatcher = (url, expected) => {
     return equals(url, expected);
 };
 const headersMatcher = (headers, expected) => {
-    if (typeof expected === 'undefined') {
+    if (typeof expected === 'undefined' ||
+        typeof expected === 'object' && Object.keys(expected).length === 0) {
         return true;
     }
     if (typeof expected === 'function') {
@@ -83,66 +88,18 @@ const headersMatcher = (headers, expected) => {
     }
     return equals(headers, expected);
 };
-const bodyMatcher = (body, expected) => {
-    if (typeof expected === 'undefined') {
-        return true;
-    }
-    if (typeof expected === 'function') {
-        return expected(body);
-    }
-    if (typeof body === 'undefined') {
-        return false;
-    }
-    let parsedBody = body;
-    if (body instanceof Buffer) {
-        parsedBody = body.toString();
-    }
-    if (typeof (body) === 'string' && isExpectedJsonLike(expected)) {
-        parsedBody = tryParseBody(body);
-        if (parsedBody === null) {
-            return false;
-        }
-    }
-    return equals(parsedBody, expected);
-};
-const isExpectedJsonLike = (expected) => {
-    if (typeof expected === 'undefined') {
-        return false;
-    }
-    const actualSample = isMatcher(expected)
-        ? expected.sample
-        : expected;
-    return (Array.isArray(actualSample) ||
-        (typeof actualSample === 'object' &&
-            actualSample !== null &&
-            actualSample instanceof RegExp === false));
-};
 const isMatcher = (filter) => {
     return typeof filter.__proto__?.asymmetricMatch === 'function';
 };
-const tryParseBody = (jsonString, fallback = null) => {
-    try {
-        return typeof jsonString === 'undefined' ? fallback : JSON.parse(jsonString);
-    }
-    catch {
-        return fallback;
-    }
-};
 const minifyRequestMock = (requestMock, requestedWith) => {
     if (typeof requestMock === 'undefined') {
         return requestMock;
     }
     const r = {
-        url: requestMock.url,
-        method: requestMock.method,
-        requestHeaders: requestMock.headers,
-        responseHeaders: requestMock.responseHeaders,
-        postData: typeof requestMock.postData === 'string' && isExpectedJsonLike(requestedWith.postData)
-            ? tryParseBody(requestMock.postData, requestMock.postData)
-            : requestMock.postData,
-        response: typeof requestMock.body === 'string' && isExpectedJsonLike(requestedWith.response)
-            ? tryParseBody(requestMock.body, requestMock.body)
-            : requestMock.body,
+        url: requestMock.request.url,
+        method: requestMock.request.method,
+        requestHeaders: requestMock.request.headers,
+        responseHeaders: requestMock.response.headers,
     };
     deleteUndefinedValues(r, requestedWith);
     return minifyRequestedWith(r);

package/lib/matchers/snapshot.js

@@ -40,7 +40,9 @@ function toMatchSnapshotAssert(received, message, inlineOptions) {
 async function toMatchSnapshotAsync(asyncReceived, message, inlineOptions) {
     let received = await asyncReceived;
     if (received && typeof received === 'object' && 'elementId' in received) {
-        received = await received.getHTML(true);
+        received = await received.getHTML({
+            includeSelectorTag: true
+        });
     }
     return toMatchSnapshotAssert(received, message, inlineOptions);
 }

package/lib/utils.js

@@ -49,8 +49,7 @@ const waitUntil = async (condition, isNot = false, { wait = DEFAULT_OPTIONS.wait
 };
 async function executeCommandBe(received, command, options) {
     const { isNot, expectation, verb = 'be' } = this;
-    received = await received;
-    let el = received;
+    let el = await received.getElement();
     const pass = await waitUntil(async () => {
         const result = await executeCommand.call(this, el, async (element) => ({ result: await command(element) }), options);
         el = result.el;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "5.0.0-alpha.0",
+  "version": "5.0.0-alpha.2",
   "author": "Mykola Grybyk <mykola.grybyk@gmail.com>",
   "description": "WebdriverIO Assertion Library",
   "license": "MIT",
@@ -38,7 +38,7 @@
   "types": "./types/standalone.d.ts",
   "typeScriptVersion": "3.8.3",
   "engines": {
-    "node": ">=16 || >=18 || >=20"
+    "node": ">=18 || >=20 || >=22"
   },
   "scripts": {
     "build": "run-s clean compile",
@@ -57,36 +57,47 @@
     "watch": "npm run compile -- --watch",
     "prepare": "husky install"
   },
+  "dependencies": {
+    "@vitest/snapshot": "^1.6.0",
+    "expect": "^29.7.0",
+    "jest-matcher-utils": "^29.7.0",
+    "lodash.isequal": "^4.5.0"
+  },
   "devDependencies": {
     "@types/debug": "^4.1.12",
-    "@types/jest": "^29.5.11",
+    "@types/jest": "^29.5.12",
     "@types/lodash.isequal": "^4.5.8",
-    "@types/node": "^20.11.14",
-    "@typescript-eslint/eslint-plugin": "^7.0.0",
-    "@typescript-eslint/parser": "^7.0.1",
-    "@vitest/coverage-v8": "^1.2.2",
+    "@types/node": "^20.14.9",
+    "@typescript-eslint/eslint-plugin": "^7.15.0",
+    "@typescript-eslint/parser": "^7.15.0",
+    "@vitest/coverage-v8": "^1.6.0",
     "c8": "^10.1.2",
     "eslint": "^8.56.0",
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-unicorn": "^54.0.0",
-    "husky": "^9.0.7",
-    "npm-run-all2": "^6.1.2",
-    "release-it": "^17.0.3",
-    "rimraf": "^5.0.5",
+    "husky": "^9.0.11",
+    "npm-run-all2": "^6.2.0",
+    "release-it": "^17.4.1",
+    "rimraf": "^5.0.7",
     "shelljs": "^0.8.5",
-    "typescript": "^5.3.3",
+    "typescript": "^5.5.3",
     "vitest": "1.6.0",
-    "webdriverio": "8.39.1"
+    "webdriverio": "9.0.0-alpha.350"
   },
-  "optionalDependencies": {
-    "@wdio/globals": "^8.29.3",
-    "@wdio/logger": "^8.28.0",
-    "webdriverio": "^8.29.3"
+  "peerDependencies": {
+    "@wdio/globals": "^9.0.0-alpha.350",
+    "@wdio/logger": "^9.0.0-alpha.350",
+    "webdriverio": "^9.0.0-alpha.350"
   },
-  "dependencies": {
-    "@vitest/snapshot": "^1.2.2",
-    "expect": "^29.7.0",
-    "jest-matcher-utils": "^29.7.0",
-    "lodash.isequal": "^4.5.0"
+  "peerDependenciesMeta": {
+    "@wdio/globals": {
+      "optional": false
+    },
+    "@wdio/logger": {
+      "optional": false
+    },
+    "webdriverio": {
+      "optional": false
+    }
   }
 }

package/types/expect-webdriverio.d.ts

@@ -185,27 +185,6 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveAttr(attribute: string, value?: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
-        /**
-         * `WebdriverIO.Element` -> `getAttribute`
-         * Element's attribute includes the value.
-         * @deprecated use `expect(el).toHaveAttribute('attribute', expect.stringContaining('...'))` instead
-         */
-        toHaveAttributeContaining(
-            attribute: string,
-            contains: string | RegExp | ExpectWebdriverIO.PartialMatcher,
-            options?: ExpectWebdriverIO.StringOptions
-        ): R
-        /**
-         * `WebdriverIO.Element` -> `getAttribute`
-         * Element's attribute includes the value.
-         * @deprecated use `expect(el).toHaveAttr('attribute', expect.stringContaining('...'))` instead
-         */
-        toHaveAttrContaining(
-            attribute: string,
-            contains: string | RegExp | ExpectWebdriverIO.PartialMatcher,
-            options?: ExpectWebdriverIO.StringOptions
-        ): R
-
         /**
          * `WebdriverIO.Element` -> `getAttribute` class
          * @deprecated since v1.3.1 - use `toHaveElementClass` instead.
@@ -230,20 +209,6 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveElementClass(className: string | RegExp | Array<string | RegExp> | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
-        /**
-         * `WebdriverIO.Element` -> `getAttribute` class
-         * Element's class includes the className.
-         * @deprecated since v1.3.1 - use `toHaveElementClassContaining` instead.
-         */
-        toHaveClassContaining(className: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
-
-        /**
-         * `WebdriverIO.Element` -> `getAttribute` class
-         * Element's class includes the className.
-         * @deprecated use `expect(el).toHaveElementClass(expect.stringContaining('...'))` instead
-         */
-        toHaveElementClassContaining(className: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
-
         /**
          * `WebdriverIO.Element` -> `getProperty`
          */
@@ -257,12 +222,6 @@ declare namespace ExpectWebdriverIO {
          * `WebdriverIO.Element` -> `getProperty` value
          */
         toHaveValue(value: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
-        /**
-         * `WebdriverIO.Element` -> `getProperty` value
-         * Element's value includes the value.
-         * @deprecated use `expect(el).toHaveValue(expect.stringContaining('...'))` instead
-         */
-        toHaveValueContaining(value: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `isClickable`
@@ -317,19 +276,6 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveLink(href: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
-        /**
-         * `WebdriverIO.Element` -> `getAttribute` href
-         * Element's href includes the value provided
-         * @deprecated use `expect(el).toHaveHref(expect.stringContaining('...'))` instead
-         */
-        toHaveHrefContaining(href: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
-        /**
-         * `WebdriverIO.Element` -> `getAttribute` href
-         * Element's href includes the value provided
-         * @deprecated use `expect(el).toHaveLink(expect.stringContaining('...'))` instead
-         */
-        toHaveLinkContaining(href: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
-
         /**
          * `WebdriverIO.Element` -> `getProperty` value
          */
@@ -338,7 +284,7 @@ declare namespace ExpectWebdriverIO {
         /**
          * `WebdriverIO.Element` -> `getSize` value
          */
-        toHaveSize(id: string | RegExp | ExpectWebdriverIO.PartialMatcher, size: { height: number; width: number }, options?: ExpectWebdriverIO.StringOptions): R
+        toHaveSize(size: { height: number; width: number }, options?: ExpectWebdriverIO.StringOptions): R
 
         /**
          * `WebdriverIO.Element` -> `getText`
@@ -363,30 +309,12 @@ declare namespace ExpectWebdriverIO {
             text: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
-        /**
-         * `WebdriverIO.Element` -> `getText`
-         * Element's text includes the text provided
-         * @deprecated use `expect(el).toHaveText(expect.stringContaining('...'))` instead
-         */
-        toHaveTextContaining(
-            text: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
-            options?: ExpectWebdriverIO.StringOptions
-        ): R
 
         /**
          * `WebdriverIO.Element` -> `getHTML`
          * Element's html equals the html provided
          */
         toHaveHTML(html: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>, options?: ExpectWebdriverIO.HTMLOptions): R
-        /**
-         * `WebdriverIO.Element` -> `getHTML`
-         * Element's html includes the html provided
-         * @deprecated use `expect(el).toHaveHTML(expect.stringContaining('...'))` instead
-         */
-        toHaveHTMLContaining(
-            html: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
-            options?: ExpectWebdriverIO.HTMLOptions
-        ): R
 
         /**
          * `WebdriverIO.Element` -> `getComputedLabel`
@@ -396,15 +324,6 @@ declare namespace ExpectWebdriverIO {
             computedLabel: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
-        /**
-         * `WebdriverIO.Element` -> `getComputedLabel`
-         * Element's computed label includes the computed label provided
-         * @deprecated use `expect(el).toHaveComputedLabel(expect.stringContaining('...'))` instead
-         */
-        toHaveComputedLabelContaining(
-            computedLabel: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
-            options?: ExpectWebdriverIO.StringOptions
-        ): R
 
         /**
          * `WebdriverIO.Element` -> `getComputedRole`
@@ -414,15 +333,6 @@ declare namespace ExpectWebdriverIO {
             computedRole: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
             options?: ExpectWebdriverIO.StringOptions
         ): R
-        /**
-         * `WebdriverIO.Element` -> `getComputedRole`
-         * Element's computed role includes the computed role provided
-         * @deprecated use `expect(el).toHaveComputedRole(expect.stringContaining('...'))` instead
-         */
-        toHaveComputedRoleContaining(
-            computedRole: string | RegExp | ExpectWebdriverIO.PartialMatcher | Array<string | RegExp>,
-            options?: ExpectWebdriverIO.StringOptions
-        ): R
 
         /**
          * `WebdriverIO.Element` -> `getSize('width')`
@@ -453,41 +363,16 @@ declare namespace ExpectWebdriverIO {
          */
         toHaveUrl(url: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
-        // ===== browser only =====
-        /**
-         * `WebdriverIO.Browser` -> `getUrl`
-         * Browser's url includes the provided text
-         * @deprecated use `expect(el).toHaveUrl(expect.stringContaining('...'))` instead
-         */
-        toHaveUrlContaining(url: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
-
         /**
          * `WebdriverIO.Browser` -> `getTitle`
          */
         toHaveTitle(title: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
-        // ===== browser only =====
-        /**
-         * `WebdriverIO.Browser` -> `getTitle`
-         * Browser's title includes the provided text
-         * @deprecated use `expect(el).toHaveTitle(expect.stringContaining('...'))` instead
-         */
-        toHaveTitleContaining(title: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
-
         /**
          * `WebdriverIO.Browser` -> `execute`
          */
         toHaveClipboardText(clipboardText: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
 
-        // ===== browser only =====
-        /**
-         * `WebdriverIO.Browser` -> `execute`
-         * Browser's clipboard includes the provided text
-         * @deprecated use `expect(el).toHaveClipboardText(expect.stringContaining('...'))` instead
-         */
-        toHaveClipboardTextContaining(clipboardText: string | RegExp | ExpectWebdriverIO.PartialMatcher, options?: ExpectWebdriverIO.StringOptions): R
-
-
         // ===== $$ only =====
         /**
          * `WebdriverIO.ElementArray` -> `$$('...').length`