(fix): guard element calls - refs 95d97bd#r138469988

webdriverio · Feb 12, 2024 · 8d146c6 · 8d146c6
1 parent e4b3439
commit 8d146c6
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/src/matchers/element/toBeClickable.ts b/src/matchers/element/toBeClickable.ts
@@ -12,7 +12,7 @@ export async function toBeClickable(
         options,
     })
 
-    const result = await executeCommandBe.call(this, received, el => el.isClickable(), options)
+    const result = await executeCommandBe.call(this, received, el => el?.isClickable(), options)
 
     await options.afterAssertion?.({
         matcherName: 'toBeClickable',

diff --git a/src/matchers/element/toBeDisplayed.ts b/src/matchers/element/toBeDisplayed.ts
@@ -13,7 +13,7 @@ export async function toBeDisplayed(
         options,
     })
 
-    const result = await executeCommandBe.call(this, received, el => el.isDisplayed(), options)
+    const result = await executeCommandBe.call(this, received, el => el?.isDisplayed(), options)
 
     await options.afterAssertion?.({
         matcherName: 'toBeDisplayed',

diff --git a/src/matchers/element/toBeDisplayedInViewport.ts b/src/matchers/element/toBeDisplayedInViewport.ts
@@ -12,7 +12,7 @@ export async function toBeDisplayedInViewport(
         options,
     })
 
-    const result = await executeCommandBe.call(this, received, el => el.isDisplayedInViewport(), options)
+    const result = await executeCommandBe.call(this, received, el => el?.isDisplayedInViewport(), options)
 
     await options.afterAssertion?.({
         matcherName: 'toBeDisplayedInViewport',

diff --git a/src/matchers/element/toBeEnabled.ts b/src/matchers/element/toBeEnabled.ts
@@ -12,7 +12,7 @@ export async function toBeEnabled(
         options,
     })
 
-    const result = await executeCommandBe.call(this, received, el => el.isEnabled(), options)
+    const result = await executeCommandBe.call(this, received, el => el?.isEnabled(), options)
 
     await options.afterAssertion?.({
         matcherName: 'toBeEnabled',

diff --git a/src/matchers/element/toBeExisting.ts b/src/matchers/element/toBeExisting.ts
@@ -14,7 +14,7 @@ export async function toExist(
         options,
     })
 
-    const result = await executeCommandBe.call(this, received, el => el.isExisting(), options)
+    const result = await executeCommandBe.call(this, received, el => el?.isExisting(), options)
 
     await options.afterAssertion?.({
         matcherName: 'toExist',

diff --git a/src/matchers/element/toBeFocused.ts b/src/matchers/element/toBeFocused.ts
@@ -12,7 +12,7 @@ export async function toBeFocused(
         options,
     })
 
-    const result = await executeCommandBe.call(this, received, el => el.isFocused(), options)
+    const result = await executeCommandBe.call(this, received, el => el?.isFocused(), options)
 
     await options.afterAssertion?.({
         matcherName: 'toBeFocused',

diff --git a/src/matchers/element/toBeSelected.ts b/src/matchers/element/toBeSelected.ts
@@ -12,7 +12,7 @@ export async function toBeSelected(
         options,
     })
 
-    const result = await executeCommandBe.call(this, received, el => el.isSelected(), options)
+    const result = await executeCommandBe.call(this, received, el => el?.isSelected(), options)
 
     await options.afterAssertion?.({
         matcherName: 'toBeSelected',