expect-webdriverio 3.5.2 → 3.6.0

package/lib/matchers/element/toBeClickable.js

@@ -5,7 +5,7 @@ const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
 async function toBeClickableFn(received, options = {}) {
     this.expectation = this.expectation || 'clickable';
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => {
             try {

package/lib/matchers/element/toBeDisabled.js

@@ -6,7 +6,7 @@ const expectAdapter_1 = require("../../util/expectAdapter");
 async function toBeDisabledFn(received, options = {}) {
     this.expectation = this.expectation || 'disabled';
     received = await received;
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => !await el.isEnabled(), options);
         return result;

package/lib/matchers/element/toBeDisplayed.js

@@ -6,7 +6,7 @@ const expectAdapter_1 = require("../../util/expectAdapter");
 async function toBeDisplayedFn(received, options = {}) {
     this.expectation = this.expectation || 'displayed';
     received = await received;
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => {
             try {

package/lib/matchers/element/toBeDisplayedInViewport.js

@@ -5,7 +5,7 @@ const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
 async function toBeDisplayedInViewportFn(received, options = {}) {
     this.expectation = this.expectation || 'displayed in viewport';
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => {
             try {

package/lib/matchers/element/toBeEnabled.js

@@ -5,7 +5,7 @@ const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
 async function toBeEnabledFn(received, options = {}) {
     this.expectation = this.expectation || 'enabled';
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, el => el.isEnabled(), options);
         return result;

package/lib/matchers/element/toBeExisting.js

@@ -7,7 +7,7 @@ async function toExistFn(received, options = {}) {
     this.expectation = this.expectation || 'exist';
     this.verb = this.verb || '';
     received = await received;
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, async (el) => {
             try {

package/lib/matchers/element/toBeFocused.js

@@ -5,7 +5,7 @@ const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
 async function toBeFocusedFn(received, options = {}) {
     this.expectation = this.expectation || 'focused';
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, el => el.isFocused(), options);
         return result;

package/lib/matchers/element/toBeSelected.js

@@ -5,7 +5,7 @@ const utils_1 = require("../../utils");
 const expectAdapter_1 = require("../../util/expectAdapter");
 async function toBeSelectedFn(received, options = {}) {
     this.expectation = this.expectation || 'selected';
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         const result = await utils_1.executeCommandBe.call(this, received, el => el.isSelected(), options);
         return result;

package/lib/matchers/element/toHaveAttribute.js

@@ -22,7 +22,7 @@ async function conditionAttrAndValue(el, attribute, value, options) {
 async function toHaveAttributeAndValueFn(received, attribute, value, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'attribute', verb = 'have' } = this;
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         let el = await received;
         let attr;
@@ -45,7 +45,7 @@ exports.toHaveAttributeAndValueFn = toHaveAttributeAndValueFn;
 async function toHaveAttributeFn(received, attribute) {
     const isNot = this.isNot;
     const { expectation = 'attribute', verb = 'have' } = this;
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         let el = await received;
         const pass = await (0, utils_1.waitUntil)(async () => {

package/lib/matchers/element/toHaveChildren.js

@@ -28,7 +28,7 @@ async function toHaveChildrenFn(received, expected, options = {}) {
     else if (typeof expected === 'object') {
         numberOptions = expected;
     }
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         let el = await received;
         let children;

package/lib/matchers/element/toHaveElementClass.js

@@ -31,7 +31,7 @@ async function toHaveElementClassFn(received, className, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'class', verb = 'have' } = this;
     const attribute = 'class';
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         let el = await received;
         let attr;

package/lib/matchers/element/toHaveElementProperty.js

@@ -21,7 +21,7 @@ async function condition(el, property, value, options = {}) {
 async function toHaveElementPropertyFn(received, property, value, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'property', verb = 'have' } = this;
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         let el = await received;
         let prop;

package/lib/matchers/element/toHaveStyle.js

@@ -9,7 +9,7 @@ async function condition(el, style, options) {
 async function toHaveStyleFn(received, style, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'style', verb = 'have' } = this;
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         let el = await received;
         let actualStyle;

package/lib/matchers/element/toHaveText.js

@@ -13,7 +13,7 @@ async function condition(el, text, options) {
 async function toHaveTextFn(received, text, options = {}) {
     const isNot = this.isNot;
     const { expectation = 'text', verb = 'have' } = this;
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         let el = await received;
         let actualText;

package/lib/matchers/elements/toBeElementsArrayOfSize.js

@@ -17,7 +17,7 @@ async function toBeElementsArrayOfSizeFn(received, expected, options = {}) {
     else {
         numberOptions = expected;
     }
-    const browser = (0, utils_1.getBrowserObject)(await received);
+    const browser = await (0, utils_1.getBrowserObject)(await received);
     return browser.call(async () => {
         let elements = await received;
         const arrLength = elements.length;

package/lib/utils.js

@@ -169,8 +169,8 @@ function aliasFn(fn, { verb, expectation } = {}, ...args) {
     return fn.apply(context, args);
 }
 exports.aliasFn = aliasFn;
-function getBrowserObject(elem) {
+async function getBrowserObject(elem) {
     const elemObject = elem;
-    return elemObject.parent ? getBrowserObject(elemObject.parent) : elem;
+    return elemObject.parent ? getBrowserObject(await elemObject.parent) : elem;
 }
 exports.getBrowserObject = getBrowserObject;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expect-webdriverio",
-  "version": "3.5.2",
+  "version": "3.6.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {

package/types/standalone.d.ts

@@ -1,14 +1,14 @@
 /// <reference types="expect-webdriverio/types/expect-webdriverio"/>
 
 declare namespace ExpectWebdriverIO {
-    interface Matchers<R, T> extends Readonly<import('expect').Matchers<R>> {
+    interface Matchers<R extends void|Promise<void>, T> extends Readonly<import('expect').Matchers<R>> {
         not: Matchers<R, T>
-        resolves: Matchers<Promise<R>, T>
-        rejects: Matchers<Promise<R>, T>
+        resolves: Matchers<R, T>
+        rejects: Matchers<R, T>
     }
 
     type Expect = {
-        <T = unknown>(actual: T): Matchers<T, T>
+        <T = unknown>(actual: T): Matchers<void, T>
         extend(map: Record<string, Function>): void
     } & AsymmetricMatchers