Fix rebase

Author: dprevost-LMI

test/__mocks__/@wdio/globals.ts

@@ -21,13 +21,12 @@ const getElementMethods = () => ({
     getComputedLabel: vi.spyOn({ getComputedLabel: async () => 'Computed Label' }, 'getComputedLabel'),
     getComputedRole: vi.spyOn({ getComputedRole: async () => 'Computed Role' }, 'getComputedRole'),
     // Null is not part of the type, to fix in wdio one day
-    getAttribute: vi.spyOn({ getAttribute: async (_attr: string) => null as unknown as string }, 'getAttribute'),
+    getAttribute: vi.spyOn({ getAttribute: async (_attr: string) => 'some attribute' }, 'getAttribute'),
     getSize: vi.spyOn({ getSize: async (prop?: 'width' | 'height') => {
         if (prop === 'width') { return 100 }
         if (prop === 'height') { return 50 }
         return { width: 100, height: 50 } satisfies Size
     } }, 'getSize') as unknown as WebdriverIO.Element['getSize'],
-    getAttribute: vi.spyOn({ getAttribute: async (_attr: string) => 'some attribute' }, 'getAttribute'),
 } satisfies Partial<WebdriverIO.Element>)
 
 const elementFactory = (_selector: string, index?: number): WebdriverIO.Element => {

test/matchers/element/toHaveText.test.ts

@@ -1,7 +1,6 @@
 import { $, $$ } from '@wdio/globals'
 import { beforeEach, describe, expect, test, vi } from 'vitest'
 
-import {  getReceived } from '../../__fixtures__/utils.js'
 import { toHaveText } from '../../../src/matchers/element/toHaveText.js'
 import type { ChainablePromiseArray } from 'webdriverio'
 
@@ -234,34 +233,43 @@ Expect ${selectorName} to have text
             expect(el.getText).toHaveBeenCalledTimes(1)
         })
 
-        test('not - failure', async () => {
+        test('not - failure - pass should be true', async () => {
             const el = await $('sel')
-
-            vi.mocked(el.getText).mockResolvedValue('WebdriverIO')
+            el.getText = vi.fn().mockResolvedValue('WebdriverIO')
 
             const result = await toHaveText.call({ isNot: true }, el, 'WebdriverIO', { wait: 0 })
-            const received = getReceived(result.message())
 
-            expect(received).not.toContain('not')
-            expect(result.pass).toBe(true)
+            expect(result.pass).toBe(true) // failure, boolean is inverted later because of `.not`
+            expect(result.message()).toEqual(`\
+Expect $(\`sel\`) not to have text
+
+Expected [not]: "WebdriverIO"
+Received      : "WebdriverIO"`
+            )
         })
 
-        test("should return false if texts don't match", async () => {
+        test('not with no trim - failure - pass should be true', async () => {
             const el = await $('sel')
-            vi.mocked(el.getText).mockResolvedValue('WebdriverIO')
+            el.getText = vi.fn().mockResolvedValue(' WebdriverIO ')
 
-            const result = await toHaveText.bind({ isNot: true })(el, 'foobar', { wait: 0 })
+            const result = await toHaveText.call({ isNot: true }, el, ' WebdriverIO ', { trim: false, wait: 0 })
 
-            expect(result.pass).toBe(false)
+            expect(result.pass).toBe(true) // failure, boolean is inverted later because of `.not`
+            expect(result.message()).toEqual(`\
+Expect $(\`sel\`) not to have text
+
+Expected [not]: " WebdriverIO "
+Received      : " WebdriverIO "`
+            )
         })
 
-        test('should return true if texts match', async () => {
+        test('not - success - pass should be false', async () => {
             const el = await $('sel')
-            vi.mocked(el.getText).mockResolvedValue('WebdriverIO')
+            el.getText = vi.fn().mockResolvedValue('WebdriverIO')
 
-            const result = await toHaveText.bind({ isNot: true })(el, 'WebdriverIO', { wait: 0 })
+            const result = await toHaveText.call({ isNot: true }, el, 'not WebdriverIO', { wait: 0 })
 
-            expect(result.pass).toBe(true)
+            expect(result.pass).toBe(false) // success, boolean is inverted later because of `.not`
         })
 
         test('should return true if actual text + single replacer matches the expected text', async () => {