Simplify Jasmine augmentation

Author: dprevost-LMI

jasmine.d.ts

@@ -1,21 +1,17 @@
 /// <reference types="./types/expect-webdriverio.d.ts"/>
 
-/**
- * Utility type that wraps non-Promise types in a Promise for Jasmine async matchers.
- * If U is already a Promise, PromiseLike, or Chainable, return U as-is.
- * Otherwise, wrap U in a Promise<U>.
- */
-type EnsurePromise<U extends void | Promise<void>> = U extends Promise<unknown> | PromiseLike<unknown> | WdioPromiseLike<unknown> ? U : Promise<U>
-
 declare namespace jasmine {
 
     /**
      * Async matchers for Jasmine to allow the typing of `expectAsync` with WebDriverIO matchers.
      * T is the type of the actual value
-     * U is the type of the expected value, which will be wrapped in a Promise if it's not already one
+     * U is the type of the expected value
      * Both T,U must stay named as they are to override the default `AsyncMatchers` type from Jasmine.
+     *
+     * We force Matchers to return a `Promise<void>` since Jasmine's `expectAsync` expects a promise in all cases (different from Jest)
      */
-    interface AsyncMatchers<T, U extends void | Promise<void>> extends Omit<ExpectWebdriverIO.Matchers<EnsurePromise<U>, T>, 'toMatchSnapshot' | 'toMatchInlineSnapshot'> {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    interface AsyncMatchers<T, U> extends Omit<ExpectWebdriverIO.Matchers<Promise<void>, T>, 'toMatchSnapshot' | 'toMatchInlineSnapshot'> {
         /**
          * snapshot matcher
          * @param label optional snapshot label

test-types/jasmine-async/types-jasmine.test.ts

@@ -453,13 +453,10 @@ describe('type assertions', () => {
 
     describe('toBe', () => {
         it('should expect void type when actual is a boolean', async () => {
-            // TODO dprevost we migth need to be a Promise here because of the expectAsync of wdio
             expectVoid = expect(true).toBe(true)
             expectVoid = expect(true).not.toBe(true)
 
-            //@ts-expect-error
             expectPromiseVoid = expectAsync(true).toBe(true)
-            //@ts-expect-error
             expectPromiseVoid = expectAsync(true).not.toBe(true)
         })
 
@@ -480,9 +477,7 @@ describe('type assertions', () => {
             expectPromiseUnknown = expectAsync(promiseBoolean).toBe(true)
             expectPromiseUnknown = expectAsync(promiseBoolean).not.toBe(true)
 
-            //@ts-expect-error
             expectPromiseVoid = expectAsync(promiseBoolean).toBe(true)
-            //@ts-expect-error
             expectPromiseVoid = expectAsync(promiseBoolean).toBe(true)
         })
 
@@ -492,13 +487,9 @@ describe('type assertions', () => {
             expectPromiseUnknown = expectAsync('text').toBe(wdioExpect.stringContaining('text'))
             expectPromiseUnknown = expectAsync('text').not.toBe(wdioExpect.stringContaining('text'))
 
-            //@ts-expect-error
             expectPromiseVoid = expectAsync('text').toBe(true)
-            //@ts-expect-error
             expectPromiseVoid = expectAsync('text').not.toBe(true)
-            //@ts-expect-error
             expectPromiseVoid = expectAsync('text').toBe(wdioExpect.stringContaining('text'))
-            //@ts-expect-error
             expectPromiseVoid = expectAsync('text').not.toBe(wdioExpect.stringContaining('text'))
         })
     })
@@ -520,9 +511,7 @@ describe('type assertions', () => {
         })
 
         it('should not support chainable and expect PromiseVoid with toBe', async () => {
-            //@ts-expect-error
             expectPromiseVoid = expectAsync(chainableElement).toBe(true)
-            //@ts-expect-error
             expectPromiseVoid = expectAsync(chainableElement).not.toBe(true)
         })
     })