Code review

Author: dprevost-LMI

src/matchers/element/toHaveAttribute.ts

@@ -82,7 +82,7 @@ async function toHaveAttributeFn(received: WdioElementOrArrayMaybePromise, attri
     }
 }
 
-// TODO we should have overload signature one with value and ExpectWebdriverIO.StringOptions, the other with no value and commnad options
+// TODO: one day it would be better to have overload signature one with value and ExpectWebdriverIO.StringOptions, the other with no value and commnad options
 export async function toHaveAttribute(
     received: WdioElementOrArrayMaybePromise,
     attribute: string,

src/matchers/element/toHaveElementProperty.ts

@@ -30,7 +30,7 @@ async function condition(
         return { result: prop === expected, value: prop }
     }
 
-    // To review the cast to be more type safe but for now let's just no create any reqgression
+    // To review the cast to be more type safe but for now let's keep the existing behavior to ensure no regression
     return compareText(prop.toString(), expected as string, options)
 }
 

src/matchers/element/toHaveText.ts

@@ -11,13 +11,13 @@ import { isAnyKindOfElementArray, map } from '../../util/elementsUtil.js'
 
 async function singleElementCompare(el: WebdriverIO.Element, text: MaybeArray<string | RegExp | WdioAsymmetricMatcher<string>>, options: ExpectWebdriverIO.StringOptions) {
     const actualText = await el.getText()
-    const checkAllValuesMatchCondition = Array.isArray(text) ?
+    const result = Array.isArray(text) ?
         compareTextWithArray(actualText, text, options).result
         : compareText(actualText, text, options).result
 
     return {
         value: actualText,
-        result: checkAllValuesMatchCondition
+        result
     }
 }
 

src/util/executeCommand.ts

@@ -20,7 +20,7 @@ import { awaitElements, isAnyKindOfElementArray, map } from './elementsUtil'
  * @param options - Optional configuration options
  */
 export async function executeCommand<T>(
-    nonAwaitedElements: WdioElementOrArrayMaybePromise,
+    nonAwaitedElements: WdioElementOrArrayMaybePromise | undefined,
     singleElementCompareStrategy?: (awaitedElement: WebdriverIO.Element) => Promise<
         { result: boolean; value?: T }
     >,

src/util/formatMessage.ts

@@ -95,7 +95,6 @@ ${diffString}`
 
 export const enhanceErrorBe = (
     subject: string | WebdriverIO.Element | WdioElements | undefined,
-    _pass: boolean,
     context: { isNot: boolean },
     verb: string,
     expectation: string,

src/utils.ts

@@ -37,7 +37,7 @@ async function executeCommandBe(
     const { isNot, expectation, verb = 'be' } = this
 
     let awaitedElements: WdioElements | WebdriverIO.Element | undefined
-    const pass = nonAwaitedElements ? await waitUntil(
+    const pass = await waitUntil(
         async () => {
             const  { elementOrArray, success, results } = await executeCommand(
                 nonAwaitedElements,
@@ -49,9 +49,9 @@ async function executeCommandBe(
         },
         isNot,
         { wait: options.wait, interval: options.interval }
-    ) : false
+    )
 
-    const message = enhanceErrorBe(awaitedElements, pass, this, verb, expectation, options)
+    const message = enhanceErrorBe(awaitedElements, this, verb, expectation, options)
 
     return {
         pass,

test/utils.test.ts

@@ -273,7 +273,6 @@ Expected: "displayed"
 Received: "not displayed"`)
                 expect(enhanceErrorBe).toHaveBeenCalledWith(
                     received,
-                    false,
                     expect.objectContaining({ isNot: false }),
                     'be',
                     'displayed',
@@ -295,7 +294,6 @@ Received: "not displayed"`)
                 )
                 expect(enhanceErrorBe).toHaveBeenCalledWith(
                     received,
-                    true,
                     expect.objectContaining({ isNot: true }),
                     'be',
                     'displayed',
@@ -334,7 +332,6 @@ Expected: "displayed"
 Received: "not displayed"`)
                     expect(enhanceErrorBe).toHaveBeenCalledWith(
                         [element1, element2],
-                        false,
                         expect.objectContaining(context),
                         context.verb,
                         context.expectation,