@vitest/browser-playwright 5.0.0-beta.1 → 5.0.0-beta.3

package/dist/index.js

@@ -1,4 +1,4 @@
-import { asLocator, parseKeyDef, resolveScreenshotPath, defineBrowserProvider } from '@vitest/browser';
+import { parseKeyDef, resolveScreenshotPath, defineBrowserProvider } from '@vitest/browser';
 export { defineBrowserCommand } from '@vitest/browser';
 import { createManualModuleSource } from '@vitest/mocker/node';
 import c from 'tinyrainbow';
@@ -173,9 +173,9 @@ const basename = function(p, extension) {
 // - locator('[data-vitest="true"]').contentFrame().getByRole('button')
 //     ⇓
 // - getByRole('button')
-function getDescribedLocator(context, selector) {
-	const locator = context.iframe.locator(selector);
-	return typeof locator.describe === "function" ? locator.describe(asLocator("javascript", selector)) : locator;
+function getDescribedLocator(context, { locator, selector }) {
+	const iframeLocator = context.iframe.locator(selector);
+	return typeof iframeLocator.describe === "function" ? iframeLocator.describe(locator) : iframeLocator;
 }
 
 const clear = async (context, selector) => {
@@ -198,7 +198,7 @@ const tripleClick = async (context, selector, options = {}) => {
 
 const dragAndDrop = async (context, source, target, options_) => {
 	const frame = await context.frame();
-	await frame.dragAndDrop(source, target, options_);
+	await frame.dragAndDrop(source.selector, target.selector, options_);
 };
 
 const fill = async (context, selector, text, options = {}) => {
@@ -527,7 +527,7 @@ async function takeScreenshot(context, name, options) {
 	const mask = options.mask?.map((selector) => getDescribedLocator(context, selector));
 	const style = context.project.config.browser.ui ? options.style === undefined ? SCREENSHOT_STYLES : SCREENSHOT_STYLES + options.style : options.style;
 	if (options.element) {
-		const { element: selector, ...config } = options;
+		const { element: selector, target: _target, ...config } = options;
 		const element = getDescribedLocator(context, selector);
 		const buffer = await element.screenshot({
 			...config,
@@ -540,8 +540,17 @@ async function takeScreenshot(context, name, options) {
 			path
 		};
 	}
-	const buffer = await getDescribedLocator(context, "body").screenshot({
-		...options,
+	const { target, ...config } = options;
+	const buffer = target === "page" ? await context.page.screenshot({
+		...config,
+		mask,
+		path: savePath,
+		style
+	}) : await getDescribedLocator(context, {
+		selector: "body",
+		locator: "locator('body')"
+	}).screenshot({
+		...config,
 		mask,
 		path: savePath,
 		style
@@ -627,14 +636,14 @@ const markTrace = async (context, payload) => {
 		if (!context.provider.tracingContexts.has(context.sessionId)) {
 			return;
 		}
-		const { name, selector, stack } = payload;
+		const { name, element, stack } = payload;
 		const location = parseLocation(context, stack);
 		// mark trace via group/groupEnd with dummy calls to force snapshot.
 		// https://github.com/microsoft/playwright/issues/39308
 		await context.context.tracing.group(name, { location });
 		try {
-			if (selector) {
-				const locator = getDescribedLocator(context, selector);
+			if (element) {
+				const locator = getDescribedLocator(context, element);
 				if (typeof locator._expect === "function") {
 					await locator._expect("to.be.attached", {
 						isNot: false,
@@ -952,7 +961,7 @@ class PlaywrightBrowserProvider {
 	createMocker() {
 		const idPredicates = new Map();
 		const sessionIds = new Map();
-		function createPredicate(sessionId, url) {
+		function createPredicate(url) {
 			const moduleUrl = new URL(url, "http://localhost");
 			const predicate = (url) => {
 				if (url.searchParams.has("_vitest_original")) {
@@ -977,11 +986,10 @@ class PlaywrightBrowserProvider {
 				}
 				return true;
 			};
-			const ids = sessionIds.get(sessionId) || [];
-			ids.push(moduleUrl.href);
-			sessionIds.set(sessionId, ids);
-			idPredicates.set(predicateKey(sessionId, moduleUrl.href), predicate);
-			return predicate;
+			return {
+				url: moduleUrl.href,
+				predicate
+			};
 		}
 		function predicateKey(sessionId, url) {
 			return `${sessionId}:${url}`;
@@ -989,7 +997,17 @@ class PlaywrightBrowserProvider {
 		return {
 			register: async (sessionId, module) => {
 				const page = this.getPage(sessionId);
-				await page.context().route(createPredicate(sessionId, module.url), async (route) => {
+				const { url: moduleUrl, predicate } = createPredicate(module.url);
+				const key = predicateKey(sessionId, moduleUrl);
+				const existingPredicate = idPredicates.get(key);
+				if (existingPredicate) {
+					await page.context().unroute(existingPredicate);
+				}
+				const ids = sessionIds.get(sessionId) ?? new Set();
+				ids.add(moduleUrl);
+				sessionIds.set(sessionId, ids);
+				idPredicates.set(key, predicate);
+				await page.context().route(predicate, async (route) => {
 					if (module.type === "manual") {
 						const exports$1 = Object.keys(await module.resolve());
 						const body = createManualModuleSource(module.url, exports$1);
@@ -1050,8 +1068,8 @@ class PlaywrightBrowserProvider {
 			},
 			clear: async (sessionId) => {
 				const page = this.getPage(sessionId);
-				const ids = sessionIds.get(sessionId) || [];
-				const promises = ids.map((id) => {
+				const ids = sessionIds.get(sessionId) ?? new Set();
+				const promises = [...ids].map((id) => {
 					const key = predicateKey(sessionId, id);
 					const predicate = idPredicates.get(key);
 					if (predicate) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vitest/browser-playwright",
   "type": "module",
-  "version": "5.0.0-beta.1",
+  "version": "5.0.0-beta.3",
   "description": "Browser running for Vitest using playwright",
   "license": "MIT",
   "funding": "https://opencollective.com/vitest",
@@ -42,7 +42,7 @@
   ],
   "peerDependencies": {
     "playwright": "*",
-    "vitest": "5.0.0-beta.1"
+    "vitest": "5.0.0-beta.3"
   },
   "peerDependenciesMeta": {
     "playwright": {
@@ -51,12 +51,12 @@
   },
   "dependencies": {
     "tinyrainbow": "^3.1.0",
-    "@vitest/mocker": "5.0.0-beta.1",
-    "@vitest/browser": "5.0.0-beta.1"
+    "@vitest/browser": "5.0.0-beta.3",
+    "@vitest/mocker": "5.0.0-beta.3"
   },
   "devDependencies": {
     "playwright": "^1.59.0",
-    "vitest": "5.0.0-beta.1"
+    "vitest": "5.0.0-beta.3"
   },
   "scripts": {
     "build": "premove dist && pnpm rollup -c",