FI-1743 fix: all expect methods should return Promise<void>

Author: uid11

autotests/tests/internalTypeTests/expect.skip.ts

@@ -28,3 +28,9 @@ void expect(htmlElementSelector.textContent, '').toMatchScreenshot('some id');
 
 // @ts-expect-error: eql is acceptable only for non-selectors
 void expect(htmlElementSelector, '').eql(htmlElementSelector);
+
+// ok
+void (expect('foo', 'foo is correct').toBe('foo') satisfies Promise<void>);
+
+// ok
+void (expect('foo', 'foo is correct').toBeDefined() satisfies Promise<void>);

src/expect.ts

@@ -5,13 +5,14 @@ import type {IsEqual, Selector} from './types/internal';
 type ExpectFunction = SelectorExpect & NotSelectorExpect;
 
 type NotSelectorExpect = <Actual>(
+  this: void,
   actual: IsEqual<Actual, Selector> extends true
     ? 'You should call some property or method on the selector'
     : Actual | Promise<Actual>,
   description: string,
 ) => NonSelectorMatchers<Actual>;
 
-type SelectorExpect = (actual: Selector, description: string) => SelectorMatchers;
+type SelectorExpect = (this: void, actual: Selector, description: string) => SelectorMatchers;
 
 /**
  * Wraps a value or promised value to assertion for further checks.

src/utils/expect/types.ts

@@ -1,6 +1,6 @@
 import type {Expect as PlaywrightExpect} from '@playwright/test';
 
-import type {ToMatchScreenshotOptions} from '../../types/internal';
+import type {Fn, ToMatchScreenshotOptions} from '../../types/internal';
 
 import type {Expect} from './Expect';
 
@@ -10,6 +10,8 @@ type EnsureString<Type> = Type extends string ? string : never;
 
 type Extend<Type, Extended> = Type extends Extended ? Extended : never;
 
+type PlaywrightMatchers = ReturnType<PlaywrightExpect>;
+
 /**
  * All assertion functions keys (names of assertion functions, like `eql`, `match`, etc).
  * @internal
@@ -60,8 +62,13 @@ export type NonSelectorAdditionalMatchers<Actual> = Readonly<{
 /**
  * All matchers.
  */
-export type NonSelectorMatchers<Actual> = NonSelectorAdditionalMatchers<Actual> &
-  ReturnType<PlaywrightExpect>;
+export type NonSelectorMatchers<Actual> = NonSelectorAdditionalMatchers<Actual> & {
+  readonly [Key in keyof PlaywrightMatchers]: Fn<
+    PlaywrightMatchers[Key] extends (...args: infer Args) => unknown ? Args : never,
+    Promise<void>,
+    void
+  >;
+};
 
 /**
  * Matchers for selector.