@vitest/browser 2.2.0-beta.2 → 3.0.0-beta.2

package/dist/index.js

@@ -8,7 +8,7 @@ import MagicString from 'magic-string';
 import sirv from 'sirv';
 import { coverageConfigDefaults } from 'vitest/config';
 import { fileURLToPath } from 'node:url';
-import { P as PlaywrightBrowserProvider, W as WebdriverBrowserProvider } from './webdriver-D0J8HSNX.js';
+import { P as PlaywrightBrowserProvider, W as WebdriverBrowserProvider } from './webdriver-JzwxG3Ek.js';
 import { resolve as resolve$1, dirname as dirname$1, basename as basename$1, normalize as normalize$1 } from 'node:path';
 import { mkdir, readFile as readFile$1 } from 'node:fs/promises';
 import crypto from 'node:crypto';
@@ -16,7 +16,7 @@ import { WebSocketServer } from 'ws';
 import { parseErrorStacktrace, parseStacktrace } from '@vitest/utils/source-map';
 import * as nodeos from 'node:os';
 
-var version = "2.2.0-beta.2";
+var version = "3.0.0-beta.2";
 
 const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
 function normalizeWindowsPath(input = "") {
@@ -204,9 +204,7 @@ const clear = async (context, selector) => {
   if (context.provider instanceof PlaywrightBrowserProvider) {
     const { iframe } = context;
     const element = iframe.locator(selector);
-    await element.clear({
-      timeout: 1e3
-    });
+    await element.clear();
   } else if (context.provider instanceof WebdriverBrowserProvider) {
     const browser = context.browser;
     const element = await browser.$(selector);
@@ -220,10 +218,7 @@ const click = async (context, selector, options = {}) => {
   const provider = context.provider;
   if (provider instanceof PlaywrightBrowserProvider) {
     const tester = context.iframe;
-    await tester.locator(selector).click({
-      timeout: 1e3,
-      ...options
-    });
+    await tester.locator(selector).click(options);
   } else if (provider instanceof WebdriverBrowserProvider) {
     const browser = context.browser;
     await browser.$(selector).click(options);
@@ -248,7 +243,6 @@ const tripleClick = async (context, selector, options = {}) => {
   if (provider instanceof PlaywrightBrowserProvider) {
     const tester = context.iframe;
     await tester.locator(selector).click({
-      timeout: 1e3,
       ...options,
       clickCount: 3
     });
@@ -266,10 +260,7 @@ const dragAndDrop = async (context, source, target, options_) => {
     await frame.dragAndDrop(
       source,
       target,
-      {
-        timeout: 1e3,
-        ...options_
-      }
+      options_
     );
   } else if (context.provider instanceof WebdriverBrowserProvider) {
     const $source = context.browser.$(source);
@@ -286,7 +277,7 @@ const fill = async (context, selector, text, options = {}) => {
   if (context.provider instanceof PlaywrightBrowserProvider) {
     const { iframe } = context;
     const element = iframe.locator(selector);
-    await element.fill(text, { timeout: 1e3, ...options });
+    await element.fill(text, options);
   } else if (context.provider instanceof WebdriverBrowserProvider) {
     const browser = context.browser;
     await browser.$(selector).setValue(text);
@@ -426,10 +417,7 @@ const _fileInfo = async ({ project, testPath = process.cwd() }, path, encoding)
 
 const hover = async (context, selector, options = {}) => {
   if (context.provider instanceof PlaywrightBrowserProvider) {
-    await context.iframe.locator(selector).hover({
-      timeout: 1e3,
-      ...options
-    });
+    await context.iframe.locator(selector).hover(options);
   } else if (context.provider instanceof WebdriverBrowserProvider) {
     const browser = context.browser;
     await browser.$(selector).moveTo(options);
@@ -935,7 +923,6 @@ const screenshot = async (context, name, options = {}) => {
       const { element: selector, ...config } = options;
       const element = context.iframe.locator(`${selector}`);
       const buffer2 = await element.screenshot({
-        timeout: 1e3,
         ...config,
         path: savePath
       });
@@ -997,10 +984,7 @@ const selectOptions = async (context, selector, userValues, options = {}) => {
       }
       return elementHandler;
     }));
-    await selectElement.selectOption(values, {
-      timeout: 1e3,
-      ...options
-    });
+    await selectElement.selectOption(values, options);
   } else if (context.provider instanceof WebdriverBrowserProvider) {
     const values = userValues;
     if (!values.length) {
@@ -1225,7 +1209,7 @@ async function getBrowserProvider(options, project) {
   }
   let customProviderModule;
   try {
-    customProviderModule = await project.runner.executeId(
+    customProviderModule = await project.import(
       options.provider
     );
   } catch (error) {
@@ -1779,7 +1763,7 @@ var BrowserPlugin = (browserServer, base = "/") => {
     {
       name: "vitest:browser:in-source-tests",
       transform(code, id) {
-        if (!project.isTestFile(id) || !code.includes("import.meta.vitest")) {
+        if (!project.isCachedTestFile(id) || !code.includes("import.meta.vitest")) {
           return;
         }
         const s = new MagicString(code, { filename: cleanUrl(id) });
@@ -2493,13 +2477,13 @@ class BrowserServer {
     const browser = this.project.config.browser.name;
     if (!browser) {
       throw new Error(
-        `[${this.project.getName()}] Browser name is required. Please, set \`test.browser.name\` option manually.`
+        `[${this.project.name}] Browser name is required. Please, set \`test.browser.name\` option manually.`
       );
     }
     const supportedBrowsers = this.provider.getSupportedBrowsers();
     if (supportedBrowsers.length && !supportedBrowsers.includes(browser)) {
       throw new Error(
-        `[${this.project.getName()}] Browser "${browser}" is not supported by the browser provider "${this.provider.name}". Supported browsers: ${supportedBrowsers.join(", ")}.`
+        `[${this.project.name}] Browser "${browser}" is not supported by the browser provider "${this.provider.name}". Supported browsers: ${supportedBrowsers.join(", ")}.`
       );
     }
     const providerOptions = this.project.config.browser.providerOptions;
@@ -2578,7 +2562,7 @@ function createBrowserPool(ctx) {
     const origin = resolvedUrls?.local[0] ?? resolvedUrls?.network[0];
     if (!origin) {
       throw new Error(
-        `Can't find browser origin URL for project "${project.getName()}" when running tests for files "${files.join('", "')}"`
+        `Can't find browser origin URL for project "${project.name}" when running tests for files "${files.join('", "')}"`
       );
     }
     async function setBreakpoint(contextId, file) {
@@ -2603,7 +2587,7 @@ function createBrowserPool(ctx) {
     }
     debug?.(
       `[%s] Running %s tests in %s chunks (%s threads)`,
-      project.getName() || "core",
+      project.name || "core",
       files.length,
       chunks.length,
       threadsCount

package/dist/locators/index.d.ts

@@ -253,6 +253,8 @@ declare abstract class Locator {
     element(): Element;
     elements(): Element[];
     all(): Locator[];
+    toString(): string;
+    toJSON(): string;
     private get state();
     private get worker();
     private get rpc();

package/dist/locators/index.js

@@ -1,4 +1,4 @@
 import '@vitest/browser/context';
 import '../public-utils-D6S2-5kI.js';
-export { L as Locator, s as selectorEngine } from '../index-CKtADM3n.js';
+export { L as Locator, s as selectorEngine } from '../index-CMAn5ZST.js';
 import 'vitest/utils';

package/dist/locators/playwright.js

@@ -1,6 +1,6 @@
 import { page, server } from '@vitest/browser/context';
 import { g as getByLabelSelector, a as getByRoleSelector, b as getByTestIdSelector, c as getByAltTextSelector, d as getByPlaceholderSelector, e as getByTextSelector, f as getByTitleSelector } from '../public-utils-D6S2-5kI.js';
-import { s as selectorEngine, L as Locator } from '../index-CKtADM3n.js';
+import { s as selectorEngine, L as Locator } from '../index-CMAn5ZST.js';
 import 'vitest/utils';
 
 page.extend({

package/dist/locators/preview.js

@@ -1,7 +1,6 @@
-import { userEvent } from '@testing-library/user-event';
-import { page, server } from '@vitest/browser/context';
+import { page, server, userEvent } from '@vitest/browser/context';
 import { g as getByLabelSelector, a as getByRoleSelector, b as getByTestIdSelector, c as getByAltTextSelector, d as getByPlaceholderSelector, e as getByTextSelector, f as getByTitleSelector, h as getElementError } from '../public-utils-D6S2-5kI.js';
-import { s as selectorEngine, L as Locator, c as convertElementToCssSelector, e as ensureAwaited } from '../index-CKtADM3n.js';
+import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-CMAn5ZST.js';
 import 'vitest/utils';
 
 page.extend({
@@ -47,53 +46,31 @@ class PreviewLocator extends Locator {
     return selectors.join(", ");
   }
   click() {
-    return ensureAwaited(() => userEvent.click(this.element()));
+    return userEvent.click(this.element());
   }
   dblClick() {
-    return ensureAwaited(() => userEvent.dblClick(this.element()));
+    return userEvent.dblClick(this.element());
   }
   tripleClick() {
-    return ensureAwaited(() => userEvent.tripleClick(this.element()));
+    return userEvent.tripleClick(this.element());
   }
   hover() {
-    return ensureAwaited(() => userEvent.hover(this.element()));
+    return userEvent.hover(this.element());
   }
   unhover() {
-    return ensureAwaited(() => userEvent.unhover(this.element()));
+    return userEvent.unhover(this.element());
   }
   async fill(text) {
-    await this.clear();
-    return ensureAwaited(() => userEvent.type(this.element(), text));
+    return userEvent.fill(this.element(), text);
   }
   async upload(file) {
-    const uploadPromise = (Array.isArray(file) ? file : [file]).map(async (file2) => {
-      if (typeof file2 !== "string") {
-        return file2;
-      }
-      const { content: base64, basename, mime } = await this.triggerCommand("__vitest_fileInfo", file2, "base64");
-      const fileInstance = fetch(`data:${mime};base64,${base64}`).then((r) => r.blob()).then((blob) => new File([blob], basename, { type: mime }));
-      return fileInstance;
-    });
-    const uploadFiles = await Promise.all(uploadPromise);
-    return ensureAwaited(() => userEvent.upload(this.element(), uploadFiles));
+    return userEvent.upload(this.element(), file);
   }
   selectOptions(options_) {
-    const options = (Array.isArray(options_) ? options_ : [options_]).map((option) => {
-      if (typeof option !== "string" && "element" in option) {
-        return option.element();
-      }
-      return option;
-    });
-    return ensureAwaited(() => userEvent.selectOptions(this.element(), options));
-  }
-  async dropTo() {
-    throw new Error('The "preview" provider doesn\'t support `dropTo` method.');
+    return userEvent.selectOptions(this.element(), options_);
   }
   clear() {
-    return ensureAwaited(() => userEvent.clear(this.element()));
-  }
-  async screenshot() {
-    throw new Error('The "preview" provider doesn\'t support `screenshot` method.');
+    return userEvent.clear(this.element());
   }
   locator(selector) {
     return new PreviewLocator(`${this._pwSelector} >> ${selector}`, this._container);

package/dist/locators/webdriverio.js

@@ -1,6 +1,6 @@
 import { page, server } from '@vitest/browser/context';
 import { g as getByLabelSelector, a as getByRoleSelector, b as getByTestIdSelector, c as getByAltTextSelector, d as getByPlaceholderSelector, e as getByTextSelector, f as getByTitleSelector, h as getElementError } from '../public-utils-D6S2-5kI.js';
-import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-CKtADM3n.js';
+import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-CMAn5ZST.js';
 import 'vitest/utils';
 
 page.extend({

package/dist/providers.js

@@ -1,4 +1,4 @@
-import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-D0J8HSNX.js';
+import { W as WebdriverBrowserProvider, P as PlaywrightBrowserProvider } from './webdriver-JzwxG3Ek.js';
 
 class PreviewBrowserProvider {
   name = "preview";

package/dist/{webdriver-D0J8HSNX.js → webdriver-JzwxG3Ek.js}

@@ -59,8 +59,9 @@ class PlaywrightBrowserProvider {
       return this.contexts.get(contextId);
     }
     const browser = await this.openBrowser();
+    const { actionTimeout, ...contextOptions } = this.options?.context ?? {};
     const options = {
-      ...this.options?.context,
+      ...contextOptions,
       ignoreHTTPSErrors: true,
       serviceWorkers: "allow"
     };
@@ -68,6 +69,9 @@ class PlaywrightBrowserProvider {
       options.viewport = null;
     }
     const context = await browser.newContext(options);
+    if (actionTimeout) {
+      context.setDefaultTimeout(actionTimeout);
+    }
     this.contexts.set(contextId, context);
     return context;
   }
@@ -130,7 +134,7 @@ class PlaywrightBrowserProvider {
   async openPage(contextId, url, beforeNavigate) {
     const browserPage = await this.openBrowserPage(contextId);
     await beforeNavigate?.();
-    await browserPage.goto(url);
+    await browserPage.goto(url, { timeout: 0 });
   }
   async getCDPSession(contextId) {
     const page = this.getPage(contextId);

package/matchers.d.ts

@@ -1,9 +1,10 @@
 import type { Locator } from '@vitest/browser/context'
 import type jsdomMatchers from './jest-dom.js'
-import type { Assertion } from 'vitest'
+import type { Assertion, ExpectPollOptions } from 'vitest'
 
 declare module 'vitest' {
   interface JestAssertion<T = any> extends jsdomMatchers.default.TestingLibraryMatchers<void, T> {}
+  interface AsymmetricMatchersContaining extends jsdomMatchers.default.TestingLibraryMatchers<void, void> {}
 
   type Promisify<O> = {
     [K in keyof O]: O[K] extends (...args: infer A) => infer R
@@ -16,6 +17,10 @@ declare module 'vitest' {
   type PromisifyDomAssertion<T> = Promisify<Assertion<T>>
 
   interface ExpectStatic {
+    /**
+     * `expect.element(locator)` is a shorthand for `expect.poll(() => locator.element())`.
+     * You can set default timeout via `expect.poll.timeout` config.
+     */
     element: <T extends Element | Locator>(element: T, options?: ExpectPollOptions) => PromisifyDomAssertion<Awaited<Element | null>>
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser",
   "type": "module",
-  "version": "2.2.0-beta.2",
+  "version": "3.0.0-beta.2",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -32,13 +32,16 @@
       "default": "./dist/client.js"
     },
     "./matchers": {
-      "types": "./matchers.d.ts"
+      "types": "./matchers.d.ts",
+      "default": "./dummy.js"
     },
     "./providers/webdriverio": {
-      "types": "./providers/webdriverio.d.ts"
+      "types": "./providers/webdriverio.d.ts",
+      "default": "./dummy.js"
     },
     "./providers/playwright": {
-      "types": "./providers/playwright.d.ts"
+      "types": "./providers/playwright.d.ts",
+      "default": "./dummy.js"
     },
     "./locator": {
       "types": "./dist/locators/index.d.ts",
@@ -62,7 +65,7 @@
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "*",
-    "vitest": "2.2.0-beta.2"
+    "vitest": "3.0.0-beta.2"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -78,32 +81,32 @@
   "dependencies": {
     "@testing-library/dom": "^10.4.0",
     "@testing-library/user-event": "^14.5.2",
-    "magic-string": "^0.30.12",
-    "msw": "^2.6.4",
+    "magic-string": "^0.30.14",
+    "msw": "^2.6.8",
     "sirv": "^3.0.0",
     "tinyrainbow": "^1.2.0",
     "ws": "^8.18.0",
-    "@vitest/mocker": "2.2.0-beta.2",
-    "@vitest/utils": "2.2.0-beta.2"
+    "@vitest/mocker": "3.0.0-beta.2",
+    "@vitest/utils": "3.0.0-beta.2"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
     "@types/ws": "^8.5.13",
     "@wdio/protocols": "^8.40.3",
     "birpc": "0.2.19",
-    "flatted": "^3.3.1",
+    "flatted": "^3.3.2",
     "ivya": "^1.1.1",
     "mime": "^4.0.4",
     "pathe": "^1.1.2",
     "periscopic": "^4.0.2",
-    "playwright": "^1.48.2",
-    "playwright-core": "^1.48.2",
-    "safaridriver": "^0.1.2",
+    "playwright": "^1.49.0",
+    "playwright-core": "^1.49.0",
+    "safaridriver": "^1.0.0",
     "webdriverio": "^8.40.6",
-    "@vitest/runner": "2.2.0-beta.2",
-    "vitest": "2.2.0-beta.2",
-    "@vitest/ui": "2.2.0-beta.2",
-    "@vitest/ws-client": "2.2.0-beta.2"
+    "@vitest/ui": "3.0.0-beta.2",
+    "@vitest/ws-client": "3.0.0-beta.2",
+    "@vitest/runner": "3.0.0-beta.2",
+    "vitest": "3.0.0-beta.2"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",

package/providers/playwright.d.ts

@@ -16,7 +16,13 @@ declare module 'vitest/node' {
     context?: Omit<
       BrowserContextOptions,
       'ignoreHTTPSErrors' | 'serviceWorkers'
-    >
+    > & {
+      /**
+       * The maximum time in milliseconds to wait for `userEvent` action to complete.
+       * @default 0 (no timeout)
+       */
+      actionTimeout?: number
+    }
   }
 
   export interface BrowserCommandContext {
@@ -27,13 +33,13 @@ declare module 'vitest/node' {
   }
 }
 
-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]
+type PWHoverOptions = NonNullable<Parameters<Page['hover']>[1]>
+type PWClickOptions = NonNullable<Parameters<Page['click']>[1]>
+type PWDoubleClickOptions = NonNullable<Parameters<Page['dblclick']>[1]>
+type PWFillOptions = NonNullable<Parameters<Page['fill']>[2]>
+type PWScreenshotOptions = NonNullable<Parameters<Page['screenshot']>[0]>
+type PWSelectOptions = NonNullable<Parameters<Page['selectOption']>[2]>
+type PWDragAndDropOptions = NonNullable<Parameters<Page['dragAndDrop']>[2]>
 
 declare module '@vitest/browser/context' {
   export interface UserEventHoverOptions extends PWHoverOptions {}