@vitest/browser 3.0.7 → 3.0.9

package/dist/locators/playwright.js

@@ -1,6 +1,7 @@
 import { page, server } from '@vitest/browser/context';
 import { g as getByTitleSelector, a as getByTextSelector, b as getByPlaceholderSelector, c as getByAltTextSelector, d as getByTestIdSelector, e as getByRoleSelector, f as getByLabelSelector } from '../public-utils-J4vwTaki.js';
-import { s as selectorEngine, L as Locator } from '../index-fqTesRIH.js';
+import { s as selectorEngine, L as Locator, g as getBrowserState } from '../index-DrTP5i7N.js';
+import { p as processTimeoutOptions, g as getIframeScale } from '../utils-VCysLhWp.js';
 import 'vitest/utils';
 
 page.extend({
@@ -38,6 +39,35 @@ class PlaywrightLocator extends Locator {
     this.selector = selector;
     this._container = _container;
   }
+  click(options) {
+    return super.click(processTimeoutOptions(processClickOptions(options)));
+  }
+  dblClick(options) {
+    return super.dblClick(processTimeoutOptions(processClickOptions(options)));
+  }
+  tripleClick(options) {
+    return super.tripleClick(processTimeoutOptions(processClickOptions(options)));
+  }
+  selectOptions(value, options) {
+    return super.selectOptions(value, processTimeoutOptions(options));
+  }
+  clear(options) {
+    return super.clear(processTimeoutOptions(options));
+  }
+  hover(options) {
+    return super.hover(processTimeoutOptions(processHoverOptions(options)));
+  }
+  upload(files, options) {
+    return super.upload(files, processTimeoutOptions(options));
+  }
+  fill(text, options) {
+    return super.fill(text, processTimeoutOptions(options));
+  }
+  dropTo(target, options) {
+    return super.dropTo(target, processTimeoutOptions(
+      processDragAndDropOptions(options)
+    ));
+  }
   locator(selector) {
     return new PlaywrightLocator(`${this.selector} >> ${selector}`, this._container);
   }
@@ -48,3 +78,46 @@ class PlaywrightLocator extends Locator {
     );
   }
 }
+function processDragAndDropOptions(options_) {
+  if (!options_ || !getBrowserState().config.browser.ui) {
+    return options_;
+  }
+  const options = options_;
+  if (options.sourcePosition) {
+    options.sourcePosition = processPlaywrightPosition(options.sourcePosition);
+  }
+  if (options.targetPosition) {
+    options.targetPosition = processPlaywrightPosition(options.targetPosition);
+  }
+  return options_;
+}
+function processHoverOptions(options_) {
+  if (!options_ || !getBrowserState().config.browser.ui) {
+    return options_;
+  }
+  const options = options_;
+  if (options.position) {
+    options.position = processPlaywrightPosition(options.position);
+  }
+  return options_;
+}
+function processClickOptions(options_) {
+  if (!options_ || !getBrowserState().config.browser.ui) {
+    return options_;
+  }
+  const options = options_;
+  if (options.position) {
+    options.position = processPlaywrightPosition(options.position);
+  }
+  return options;
+}
+function processPlaywrightPosition(position) {
+  const scale = getIframeScale();
+  if (position.x != null) {
+    position.x *= scale;
+  }
+  if (position.y != null) {
+    position.y *= scale;
+  }
+  return position;
+}

package/dist/locators/preview.js

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

package/dist/locators/webdriverio.js

@@ -1,6 +1,7 @@
 import { page, server } from '@vitest/browser/context';
 import { g as getByTitleSelector, a as getByTextSelector, b as getByPlaceholderSelector, c as getByAltTextSelector, d as getByTestIdSelector, e as getByRoleSelector, f as getByLabelSelector, h as getElementError } from '../public-utils-J4vwTaki.js';
-import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-fqTesRIH.js';
+import { s as selectorEngine, L as Locator, g as getBrowserState } from '../index-DrTP5i7N.js';
+import { c as convertElementToCssSelector, g as getIframeScale } from '../utils-VCysLhWp.js';
 import 'vitest/utils';
 
 page.extend({
@@ -42,9 +43,24 @@ class WebdriverIOLocator extends Locator {
     }
     return selectors.join(", ");
   }
-  selectOptions(value) {
+  click(options) {
+    return super.click(processClickOptions(options));
+  }
+  dblClick(options) {
+    return super.dblClick(processClickOptions(options));
+  }
+  tripleClick(options) {
+    return super.tripleClick(processClickOptions(options));
+  }
+  selectOptions(value, options) {
     const values = getWebdriverioSelectOptions(this.element(), value);
-    return this.triggerCommand("__vitest_selectOptions", this.selector, values);
+    return this.triggerCommand("__vitest_selectOptions", this.selector, values, options);
+  }
+  hover(options) {
+    return super.hover(processHoverOptions(options));
+  }
+  dropTo(target, options) {
+    return super.dropTo(target, processDragAndDropOptions(options));
   }
   locator(selector) {
     return new WebdriverIOLocator(`${this._pwSelector} >> ${selector}`, this._container);
@@ -83,3 +99,59 @@ function getWebdriverioSelectOptions(element, value) {
   }
   return [{ index: labelIndex }];
 }
+function processClickOptions(options_) {
+  if (!options_ || !getBrowserState().config.browser.ui) {
+    return options_;
+  }
+  const options = options_;
+  if (options.x != null || options.y != null) {
+    const cache = {};
+    if (options.x != null) {
+      options.x = scaleCoordinate(options.x, cache);
+    }
+    if (options.y != null) {
+      options.y = scaleCoordinate(options.y, cache);
+    }
+  }
+  return options_;
+}
+function processHoverOptions(options_) {
+  if (!options_ || !getBrowserState().config.browser.ui) {
+    return options_;
+  }
+  const options = options_;
+  const cache = {};
+  if (options.xOffset != null) {
+    options.xOffset = scaleCoordinate(options.xOffset, cache);
+  }
+  if (options.yOffset != null) {
+    options.yOffset = scaleCoordinate(options.yOffset, cache);
+  }
+  return options_;
+}
+function processDragAndDropOptions(options_) {
+  if (!options_ || !getBrowserState().config.browser.ui) {
+    return options_;
+  }
+  const cache = {};
+  const options = options_;
+  if (options.sourceX != null) {
+    options.sourceX = scaleCoordinate(options.sourceX, cache);
+  }
+  if (options.sourceY != null) {
+    options.sourceY = scaleCoordinate(options.sourceY, cache);
+  }
+  if (options.targetX != null) {
+    options.targetX = scaleCoordinate(options.targetX, cache);
+  }
+  if (options.targetY != null) {
+    options.targetY = scaleCoordinate(options.targetY, cache);
+  }
+  return options_;
+}
+function scaleCoordinate(coordinate, cache) {
+  return Math.round(coordinate * getCachedScale(cache));
+}
+function getCachedScale(cache) {
+  return cache.scale ??= getIframeScale();
+}

package/dist/utils-VCysLhWp.js

@@ -0,0 +1,115 @@
+import { g as getBrowserState, a as getWorkerState } from './index-DrTP5i7N.js';
+
+const provider = getBrowserState().provider;
+// @__NO_SIDE_EFFECTS__
+function convertElementToCssSelector(element) {
+  if (!element || !(element instanceof Element)) {
+    throw new Error(
+      `Expected DOM element to be an instance of Element, received ${typeof element}`
+    );
+  }
+  return getUniqueCssSelector(element);
+}
+function escapeIdForCSSSelector(id) {
+  return id.split("").map((char) => {
+    const code = char.charCodeAt(0);
+    if (char === " " || char === "#" || char === "." || char === ":" || char === "[" || char === "]" || char === ">" || char === "+" || char === "~" || char === "\\") {
+      return `\\${char}`;
+    } else if (code >= 65536) {
+      return `\\${code.toString(16).toUpperCase().padStart(6, "0")} `;
+    } else if (code < 32 || code === 127) {
+      return `\\${code.toString(16).toUpperCase().padStart(2, "0")} `;
+    } else if (code >= 128) {
+      return `\\${code.toString(16).toUpperCase().padStart(2, "0")} `;
+    } else {
+      return char;
+    }
+  }).join("");
+}
+function getUniqueCssSelector(el) {
+  const path = [];
+  let parent;
+  let hasShadowRoot = false;
+  while (parent = getParent(el)) {
+    if (parent.shadowRoot) {
+      hasShadowRoot = true;
+    }
+    const tag = el.tagName;
+    if (el.id) {
+      path.push(`#${escapeIdForCSSSelector(el.id)}`);
+    } else if (!el.nextElementSibling && !el.previousElementSibling) {
+      path.push(tag.toLowerCase());
+    } else {
+      let index = 0;
+      let sameTagSiblings = 0;
+      let elementIndex = 0;
+      for (const sibling of parent.children) {
+        index++;
+        if (sibling.tagName === tag) {
+          sameTagSiblings++;
+        }
+        if (sibling === el) {
+          elementIndex = index;
+        }
+      }
+      if (sameTagSiblings > 1) {
+        path.push(`${tag.toLowerCase()}:nth-child(${elementIndex})`);
+      } else {
+        path.push(tag.toLowerCase());
+      }
+    }
+    el = parent;
+  }
+  return `${getBrowserState().provider === "webdriverio" && hasShadowRoot ? ">>>" : ""}${path.reverse().join(" > ")}`;
+}
+function getParent(el) {
+  const parent = el.parentNode;
+  if (parent instanceof ShadowRoot) {
+    return parent.host;
+  }
+  return parent;
+}
+const now = Date.now;
+function processTimeoutOptions(options_) {
+  if (
+    // if timeout is set, keep it
+    options_ && options_.timeout != null || provider !== "playwright"
+  ) {
+    return options_;
+  }
+  if (getWorkerState().config.browser.providerOptions.actionTimeout != null) {
+    return options_;
+  }
+  const currentTest = getWorkerState().current;
+  const startTime = currentTest?.result?.startTime;
+  if (!currentTest || currentTest.type === "suite" || !startTime) {
+    return options_;
+  }
+  const timeout = currentTest.timeout;
+  if (timeout === 0 || timeout === Number.POSITIVE_INFINITY) {
+    return options_;
+  }
+  options_ = options_ || {};
+  const currentTime = now();
+  const endTime = startTime + timeout;
+  const remainingTime = endTime - currentTime;
+  if (remainingTime <= 0) {
+    return options_;
+  }
+  options_.timeout = remainingTime - 100;
+  return options_;
+}
+function getIframeScale() {
+  const testerUi = window.parent.document.querySelector("#tester-ui");
+  if (!testerUi) {
+    throw new Error(`Cannot find Tester element. This is a bug in Vitest. Please, open a new issue with reproduction.`);
+  }
+  const scaleAttribute = testerUi.getAttribute("data-scale");
+  const scale = Number(scaleAttribute);
+  if (Number.isNaN(scale)) {
+    throw new TypeError(`Cannot parse scale value from Tester element (${scaleAttribute}). This is a bug in Vitest. Please, open a new issue with reproduction.`);
+  }
+  return scale;
+}
+
+export { convertElementToCssSelector as c, getIframeScale as g, processTimeoutOptions as p };

package/matchers.d.ts

@@ -19,7 +19,8 @@ declare module 'vitest' {
   interface ExpectStatic {
     /**
      * `expect.element(locator)` is a shorthand for `expect.poll(() => locator.element())`.
-     * You can set default timeout via `expect.poll.timeout` config.
+     * You can set default timeout via `expect.poll.timeout` option in the config.
+     * @see {@link https://vitest.dev/api/expect#poll}
      */
     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": "3.0.7",
+  "version": "3.0.9",
   "description": "Browser running for Vitest",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -66,7 +66,7 @@
   "peerDependencies": {
     "playwright": "*",
     "webdriverio": "^7.0.0 || ^8.0.0 || ^9.0.0",
-    "vitest": "3.0.7"
+    "vitest": "3.0.9"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -87,8 +87,8 @@
     "sirv": "^3.0.1",
     "tinyrainbow": "^2.0.0",
     "ws": "^8.18.1",
-    "@vitest/mocker": "3.0.7",
-    "@vitest/utils": "3.0.7"
+    "@vitest/mocker": "3.0.9",
+    "@vitest/utils": "3.0.9"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.6.3",
@@ -105,10 +105,10 @@
     "playwright-core": "^1.50.1",
     "safaridriver": "^1.0.0",
     "webdriverio": "^9.10.0",
-    "@vitest/runner": "3.0.7",
-    "@vitest/ui": "3.0.7",
-    "@vitest/ws-client": "3.0.7",
-    "vitest": "3.0.7"
+    "@vitest/ui": "3.0.9",
+    "vitest": "3.0.9",
+    "@vitest/ws-client": "3.0.9",
+    "@vitest/runner": "3.0.9"
   },
   "scripts": {
     "build": "rimraf dist && pnpm build:node && pnpm build:client",

package/providers/playwright.d.ts

@@ -41,6 +41,7 @@ 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]>
+type PWSetInputFiles = NonNullable<Parameters<Page['setInputFiles']>[2]>
 
 declare module '@vitest/browser/context' {
   export interface UserEventHoverOptions extends PWHoverOptions {}
@@ -50,6 +51,7 @@ declare module '@vitest/browser/context' {
   export interface UserEventFillOptions extends PWFillOptions {}
   export interface UserEventSelectOptions extends PWSelectOptions {}
   export interface UserEventDragAndDropOptions extends PWDragAndDropOptions {}
+  export interface UserEventUploadOptions extends PWSetInputFiles {}
 
   export interface ScreenshotOptions extends PWScreenshotOptions {}