@vitest/browser 3.1.0-beta.1 → 3.1.0-beta.2

package/dist/locators/index.d.ts

@@ -249,6 +249,9 @@ declare abstract class Locator {
 	getByTestId(testId: string | RegExp): Locator;
 	getByText(text: string | RegExp, options?: LocatorOptions): Locator;
 	getByTitle(title: string | RegExp, options?: LocatorOptions): Locator;
+	filter(filter: LocatorOptions): Locator;
+	and(locator: Locator): Locator;
+	or(locator: Locator): Locator;
 	query(): Element | null;
 	element(): Element;
 	elements(): Element[];

package/dist/locators/index.js

@@ -1,4 +1,4 @@
 import '@vitest/browser/context';
-import '../public-utils-J4vwTaki.js';
-export { L as Locator, s as selectorEngine } from '../index-DrTP5i7N.js';
+import '../public-utils-4WiYB3_6.js';
+export { L as Locator, s as selectorEngine } from '../index-VvsEiykv.js';
 import 'vitest/utils';

package/dist/locators/playwright.js

@@ -1,123 +1,114 @@
 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, g as getBrowserState } from '../index-DrTP5i7N.js';
-import { p as processTimeoutOptions, g as getIframeScale } from '../utils-VCysLhWp.js';
+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-4WiYB3_6.js';
+import { s as selectorEngine, L as Locator, p as processTimeoutOptions, g as getBrowserState, a as getIframeScale } from '../index-VvsEiykv.js';
 import 'vitest/utils';
 
 page.extend({
-  getByLabelText(text, options) {
-    return new PlaywrightLocator(getByLabelSelector(text, options));
-  },
-  getByRole(role, options) {
-    return new PlaywrightLocator(getByRoleSelector(role, options));
-  },
-  getByTestId(testId) {
-    return new PlaywrightLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute, testId));
-  },
-  getByAltText(text, options) {
-    return new PlaywrightLocator(getByAltTextSelector(text, options));
-  },
-  getByPlaceholder(text, options) {
-    return new PlaywrightLocator(getByPlaceholderSelector(text, options));
-  },
-  getByText(text, options) {
-    return new PlaywrightLocator(getByTextSelector(text, options));
-  },
-  getByTitle(title, options) {
-    return new PlaywrightLocator(getByTitleSelector(title, options));
-  },
-  elementLocator(element) {
-    return new PlaywrightLocator(
-      selectorEngine.generateSelectorSimple(element),
-      element
-    );
-  }
+	getByLabelText(text, options) {
+		return new PlaywrightLocator(getByLabelSelector(text, options));
+	},
+	getByRole(role, options) {
+		return new PlaywrightLocator(getByRoleSelector(role, options));
+	},
+	getByTestId(testId) {
+		return new PlaywrightLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute, testId));
+	},
+	getByAltText(text, options) {
+		return new PlaywrightLocator(getByAltTextSelector(text, options));
+	},
+	getByPlaceholder(text, options) {
+		return new PlaywrightLocator(getByPlaceholderSelector(text, options));
+	},
+	getByText(text, options) {
+		return new PlaywrightLocator(getByTextSelector(text, options));
+	},
+	getByTitle(title, options) {
+		return new PlaywrightLocator(getByTitleSelector(title, options));
+	},
+	elementLocator(element) {
+		return new PlaywrightLocator(selectorEngine.generateSelectorSimple(element), element);
+	}
 });
 class PlaywrightLocator extends Locator {
-  constructor(selector, _container) {
-    super();
-    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);
-  }
-  elementLocator(element) {
-    return new PlaywrightLocator(
-      selectorEngine.generateSelectorSimple(element),
-      element
-    );
-  }
+	constructor(selector, _container) {
+		super();
+		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);
+	}
+	elementLocator(element) {
+		return new PlaywrightLocator(selectorEngine.generateSelectorSimple(element), element);
+	}
 }
 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_;
+	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_;
+	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;
+	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;
+	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,85 +1,78 @@
 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 { c as convertElementToCssSelector } from '../utils-VCysLhWp.js';
-import { s as selectorEngine, L as Locator } from '../index-DrTP5i7N.js';
+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-4WiYB3_6.js';
+import { s as selectorEngine, L as Locator, c as convertElementToCssSelector } from '../index-VvsEiykv.js';
 import 'vitest/utils';
 
 page.extend({
-  getByLabelText(text, options) {
-    return new PreviewLocator(getByLabelSelector(text, options));
-  },
-  getByRole(role, options) {
-    return new PreviewLocator(getByRoleSelector(role, options));
-  },
-  getByTestId(testId) {
-    return new PreviewLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute, testId));
-  },
-  getByAltText(text, options) {
-    return new PreviewLocator(getByAltTextSelector(text, options));
-  },
-  getByPlaceholder(text, options) {
-    return new PreviewLocator(getByPlaceholderSelector(text, options));
-  },
-  getByText(text, options) {
-    return new PreviewLocator(getByTextSelector(text, options));
-  },
-  getByTitle(title, options) {
-    return new PreviewLocator(getByTitleSelector(title, options));
-  },
-  elementLocator(element) {
-    return new PreviewLocator(
-      selectorEngine.generateSelectorSimple(element),
-      element
-    );
-  }
+	getByLabelText(text, options) {
+		return new PreviewLocator(getByLabelSelector(text, options));
+	},
+	getByRole(role, options) {
+		return new PreviewLocator(getByRoleSelector(role, options));
+	},
+	getByTestId(testId) {
+		return new PreviewLocator(getByTestIdSelector(server.config.browser.locators.testIdAttribute, testId));
+	},
+	getByAltText(text, options) {
+		return new PreviewLocator(getByAltTextSelector(text, options));
+	},
+	getByPlaceholder(text, options) {
+		return new PreviewLocator(getByPlaceholderSelector(text, options));
+	},
+	getByText(text, options) {
+		return new PreviewLocator(getByTextSelector(text, options));
+	},
+	getByTitle(title, options) {
+		return new PreviewLocator(getByTitleSelector(title, options));
+	},
+	elementLocator(element) {
+		return new PreviewLocator(selectorEngine.generateSelectorSimple(element), element);
+	}
 });
 class PreviewLocator extends Locator {
-  constructor(_pwSelector, _container) {
-    super();
-    this._pwSelector = _pwSelector;
-    this._container = _container;
-  }
-  get selector() {
-    const selectors = this.elements().map((element) => convertElementToCssSelector(element));
-    if (!selectors.length) {
-      throw getElementError(this._pwSelector, this._container || document.body);
-    }
-    return selectors.join(", ");
-  }
-  click() {
-    return userEvent.click(this.element());
-  }
-  dblClick() {
-    return userEvent.dblClick(this.element());
-  }
-  tripleClick() {
-    return userEvent.tripleClick(this.element());
-  }
-  hover() {
-    return userEvent.hover(this.element());
-  }
-  unhover() {
-    return userEvent.unhover(this.element());
-  }
-  async fill(text) {
-    return userEvent.fill(this.element(), text);
-  }
-  async upload(file) {
-    return userEvent.upload(this.element(), file);
-  }
-  selectOptions(options_) {
-    return userEvent.selectOptions(this.element(), options_);
-  }
-  clear() {
-    return userEvent.clear(this.element());
-  }
-  locator(selector) {
-    return new PreviewLocator(`${this._pwSelector} >> ${selector}`, this._container);
-  }
-  elementLocator(element) {
-    return new PreviewLocator(
-      selectorEngine.generateSelectorSimple(element),
-      element
-    );
-  }
+	constructor(_pwSelector, _container) {
+		super();
+		this._pwSelector = _pwSelector;
+		this._container = _container;
+	}
+	get selector() {
+		const selectors = this.elements().map((element) => convertElementToCssSelector(element));
+		if (!selectors.length) {
+			throw getElementError(this._pwSelector, this._container || document.body);
+		}
+		return selectors.join(", ");
+	}
+	click() {
+		return userEvent.click(this.element());
+	}
+	dblClick() {
+		return userEvent.dblClick(this.element());
+	}
+	tripleClick() {
+		return userEvent.tripleClick(this.element());
+	}
+	hover() {
+		return userEvent.hover(this.element());
+	}
+	unhover() {
+		return userEvent.unhover(this.element());
+	}
+	async fill(text) {
+		return userEvent.fill(this.element(), text);
+	}
+	async upload(file) {
+		return userEvent.upload(this.element(), file);
+	}
+	selectOptions(options_) {
+		return userEvent.selectOptions(this.element(), options_);
+	}
+	clear() {
+		return userEvent.clear(this.element());
+	}
+	locator(selector) {
+		return new PreviewLocator(`${this._pwSelector} >> ${selector}`, this._container);
+	}
+	elementLocator(element) {
+		return new PreviewLocator(selectorEngine.generateSelectorSimple(element), element);
+	}
 }