@vitest/browser 2.0.0-beta.10 → 2.0.0-beta.12

package/matchers.d.ts

@@ -0,0 +1,22 @@
+import type jsdomMatchers from './jest-dom.js'
+import type { Assertion } from 'vitest'
+
+declare module 'vitest' {
+  interface JestAssertion<T = any> extends jsdomMatchers.default.TestingLibraryMatchers<void, T> {}
+
+  type Promisify<O> = {
+    [K in keyof O]: O[K] extends (...args: infer A) => infer R
+      ? O extends R
+        ? Promisify<O[K]>
+        : (...args: A) => Promise<R>
+      : O[K];
+  }
+
+  type PromisifyDomAssertion<T> = Promisify<Assertion<T>>
+
+  interface ExpectStatic {
+    element: <T extends Element>(element: T, options?: ExpectPollOptions) => PromisifyDomAssertion<Awaited<T>>
+  }
+}
+
+export {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.12",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -28,6 +28,9 @@
       "types": "./context.d.ts",
       "default": "./context.js"
     },
+    "./matchers": {
+      "types": "./matchers.d.ts"
+    },
     "./providers/webdriverio": {
       "types": "./providers/webdriverio.d.ts"
     },
@@ -41,13 +44,14 @@
   "types": "./dist/index.d.ts",
   "files": [
     "*.d.ts",
+    "context.js",
     "dist",
     "providers"
   ],
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "*",
-    "vitest": "2.0.0-beta.10"
+    "vitest": "2.0.0-beta.12"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -66,9 +70,11 @@
     "magic-string": "^0.30.10",
     "msw": "^2.3.1",
     "sirv": "^2.0.4",
-    "@vitest/utils": "2.0.0-beta.10"
+    "ws": "^8.17.1",
+    "@vitest/utils": "2.0.0-beta.12"
   },
   "devDependencies": {
+    "@testing-library/jest-dom": "^6.4.6",
     "@types/ws": "^8.5.10",
     "@wdio/protocols": "^8.38.0",
     "birpc": "0.2.17",
@@ -79,10 +85,10 @@
     "playwright-core": "^1.44.1",
     "safaridriver": "^0.1.2",
     "webdriverio": "^8.38.2",
-    "@vitest/runner": "2.0.0-beta.10",
-    "@vitest/ui": "2.0.0-beta.10",
-    "@vitest/ws-client": "2.0.0-beta.10",
-    "vitest": "2.0.0-beta.10"
+    "@vitest/runner": "2.0.0-beta.12",
+    "@vitest/ui": "2.0.0-beta.12",
+    "@vitest/ws-client": "2.0.0-beta.12",
+    "vitest": "2.0.0-beta.12"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",

package/providers/playwright.d.ts

@@ -1,20 +1,66 @@
 import type {
+  BrowserContext,
   BrowserContextOptions,
+  Frame,
   FrameLocator,
   LaunchOptions,
-  Locator,
   Page,
+  CDPSession
 } from 'playwright'
+import { Protocol } from 'playwright-core/types/protocol'
+import '../matchers.js'
 
 declare module 'vitest/node' {
   interface BrowserProviderOptions {
     launch?: LaunchOptions
-    context?: Omit<BrowserContextOptions, 'ignoreHTTPSErrors' | 'serviceWorkers'>
+    context?: Omit<
+      BrowserContextOptions,
+      'ignoreHTTPSErrors' | 'serviceWorkers'
+    >
   }
 
   export interface BrowserCommandContext {
     page: Page
-    tester: FrameLocator
-    body: Locator
+    frame(): Promise<Frame>
+    iframe: FrameLocator
+    context: BrowserContext
+  }
+}
+
+type PWHoverOptions = Parameters<Page['hover']>[1]
+type PWClickOptions = Parameters<Page['click']>[1]
+type PWDoubleClickOptions = Parameters<Page['dblclick']>[1]
+type PWFillOptions = Parameters<Page['fill']>[2]
+type PWScreenshotOptions = Parameters<Page['screenshot']>[0]
+type PWSelectOptions = Parameters<Page['selectOption']>[2]
+type PWDragAndDropOptions = Parameters<Page['dragAndDrop']>[2]
+
+declare module '@vitest/browser/context' {
+  export interface UserEventHoverOptions extends PWHoverOptions {}
+  export interface UserEventClickOptions extends PWClickOptions {}
+  export interface UserEventDoubleClickOptions extends PWDoubleClickOptions {}
+  export interface UserEventFillOptions extends PWFillOptions {}
+  export interface UserEventSelectOptions extends PWSelectOptions {}
+  export interface UserEventDragOptions extends UserEventDragAndDropOptions {}
+
+  export interface ScreenshotOptions extends PWScreenshotOptions {}
+
+  export interface CDPSession {
+    send<T extends keyof Protocol.CommandParameters>(
+      method: T,
+      params?: Protocol.CommandParameters[T]
+    ): Promise<Protocol.CommandReturnValues[T]>
+    on<T extends keyof Protocol.Events>(
+      event: T,
+      listener: (payload: Protocol.Events[T]) => void
+    ): this;
+    once<T extends keyof Protocol.Events>(
+      event: T,
+      listener: (payload: Protocol.Events[T]) => void
+    ): this;
+    off<T extends keyof Protocol.Events>(
+      event: T,
+      listener: (payload: Protocol.Events[T]) => void
+    ): this;
   }
 }

package/providers/webdriverio.d.ts

@@ -1,4 +1,5 @@
 import type { RemoteOptions } from 'webdriverio'
+import '../matchers.js'
 
 declare module 'vitest/node' {
   interface BrowserProviderOptions extends RemoteOptions {}