Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.
TypeScript automationchromechromiume2e-testingelectronend-to-end-testingfirefoxjavascriptplaywrighttesttest-automationtestingtesting-toolswebwebkit
chore: remove unwrap popout url (#37787)
Pavel Feldmand5c299dc73f2
diff --git a/packages/playwright-core/src/server/trace/viewer/traceViewer.ts b/packages/playwright-core/src/server/trace/viewer/traceViewer.tsindex 53438cf7c0..52e432e2ab 100644--- a/packages/playwright-core/src/server/trace/viewer/traceViewer.ts+++ b/packages/playwright-core/src/server/trace/viewer/traceViewer.ts@@ -69,8 +69,6 @@ export async function startTraceViewerServer(options?: TraceViewerServerOptions)server.routePrefix('/trace', (request, response) => {const url = new URL('http://localhost' + request.url!);const relativePath = url.pathname.slice('/trace'.length);- if (relativePath.endsWith('/stall.js'))- return true;if (relativePath.startsWith('/file')) {try {const filePath = url.searchParams.get('path')!;diff --git a/packages/playwright/src/reporters/html.ts b/packages/playwright/src/reporters/html.tsindex 898034c2e6..153eb16a13 100644--- a/packages/playwright/src/reporters/html.ts+++ b/packages/playwright/src/reporters/html.ts@@ -222,8 +222,6 @@ export function startHtmlReportServer(folder: string): HttpServer {return false;}}- if (relativePath.endsWith('/stall.js'))- return true;if (relativePath === '/')relativePath = '/index.html';const absolutePath = path.join(folder, ...relativePath.split('/'));diff --git a/packages/trace-viewer/snapshot.html b/packages/trace-viewer/snapshot.htmlindex 3f27586af5..60a5d82cf5 100644--- a/packages/trace-viewer/snapshot.html+++ b/packages/trace-viewer/snapshot.html@@ -16,6 +16,7 @@<!DOCTYPE html><html lang="en"><body>+ <iframe src="about:blank" style="position:absolute;top:0;left:0;right:0;bottom:0;width:100%;height:100%;border:none;"></iframe><script>(async () => {if (!navigator.serviceWorker)@@ -26,10 +27,9 @@const traceUrl = new URL(location.href).searchParams.get('trace');const params = new URLSearchParams();params.set('trace', traceUrl);- await fetch('contexts?' + params.toString()).then(r => r.json());- await location.reload();+ await fetch('contexts?' + params.toString());+ document.querySelector('iframe').src = new URLSearchParams(location.search).get('r');})();</script>- <!-- <script src="stall.js"></script> --></body></html>diff --git a/packages/trace-viewer/src/sw/main.ts b/packages/trace-viewer/src/sw/main.tsindex 731cb8e552..5c3a6ed852 100644--- a/packages/trace-viewer/src/sw/main.ts+++ b/packages/trace-viewer/src/sw/main.ts@@ -15,7 +15,6 @@*/import { splitProgress } from './progress';-import { unwrapPopoutUrl } from './snapshotRenderer';import { SnapshotServer } from './snapshotServer';import { TraceModel } from './traceModel';import { FetchTraceModelBackend, traceFileURL, ZipTraceModelBackend } from './traceModelBackends';@@ -86,7 +85,7 @@ async function doFetch(event: FetchEvent): Promise<Response> {const isDeployedAsHttps = self.registration.scope.startsWith('https://');if (request.url.startsWith(self.registration.scope)) {- const url = new URL(unwrapPopoutUrl(request.url));+ const url = new URL(request.url);const relativePath = url.pathname.substring(scopePath.length - 1);if (relativePath === '/ping') {await gc();@@ -163,7 +162,7 @@ async function doFetch(event: FetchEvent): Promise<Response> {return fetch(event.request);}- const snapshotUrl = unwrapPopoutUrl(client!.url);+ const snapshotUrl = client!.url;const traceUrl = new URL(snapshotUrl).searchParams.get('trace')!;const { snapshotServer } = loadedTraces.get(traceUrl) || {};if (!snapshotServer)diff --git a/packages/trace-viewer/src/sw/snapshotRenderer.ts b/packages/trace-viewer/src/sw/snapshotRenderer.tsindex a0980ac7b1..2fb69eb196 100644--- a/packages/trace-viewer/src/sw/snapshotRenderer.ts+++ b/packages/trace-viewer/src/sw/snapshotRenderer.ts@@ -255,7 +255,7 @@ declare global {}function snapshotScript(viewport: ViewportSize, ...targetIds: (string | undefined)[]) {- function applyPlaywrightAttributes(unwrapPopoutUrl: (url: string) => string, viewport: ViewportSize, ...targetIds: (string | undefined)[]) {+ function applyPlaywrightAttributes(viewport: ViewportSize, ...targetIds: (string | undefined)[]) {const searchParams = new URLSearchParams(location.search);const shouldPopulateCanvasFromScreenshot = searchParams.has('shouldPopulateCanvasFromScreenshot');const isUnderTest = searchParams.has('isUnderTest');@@ -344,7 +344,7 @@ function snapshotScript(viewport: ViewportSize, ...targetIds: (string | undefineiframe.setAttribute('src', 'data:text/html,<body style="background: #ddd"></body>');} else {// Retain query parameters to inherit name=, time=, pointX=, pointY= and other values from parent.- const url = new URL(unwrapPopoutUrl(window.location.href));+ const url = new URL(window.location.href);// We can be loading iframe from within iframe, reset base to be absolute.const index = url.pathname.lastIndexOf('/snapshot/');if (index !== -1)@@ -558,7 +558,7 @@ function snapshotScript(viewport: ViewportSize, ...targetIds: (string | undefinewindow.addEventListener('DOMContentLoaded', onDOMContentLoaded);}- return `\n(${applyPlaywrightAttributes.toString()})(${unwrapPopoutUrl.toString()}, ${JSON.stringify(viewport)}${targetIds.map(id => `, "${id}"`).join('')})`;+ return `\n(${applyPlaywrightAttributes.toString()})(${JSON.stringify(viewport)}${targetIds.map(id => `, "${id}"`).join('')})`;}@@ -632,11 +632,3 @@ function escapeURLsInStyleSheet(text: string): string {};return text.replace(urlToEscapeRegex1, replacer).replace(urlToEscapeRegex2, replacer);}--// <base>/snapshot.html?r=<snapshotUrl> is used for "pop out snapshot" feature.-export function unwrapPopoutUrl(url: string) {- const u = new URL(url);- if (u.pathname.endsWith('/snapshot.html'))- return u.searchParams.get('r')!;- return url;-}diff --git a/packages/trace-viewer/src/ui/snapshotTab.tsx b/packages/trace-viewer/src/ui/snapshotTab.tsxindex ce0f1d6890..82c68078cb 100644--- a/packages/trace-viewer/src/ui/snapshotTab.tsx+++ b/packages/trace-viewer/src/ui/snapshotTab.tsx@@ -434,12 +434,6 @@ export function extendSnapshot(traceUrl: string, snapshot: Snapshot, shouldPopulconst popoutParams = new URLSearchParams();popoutParams.set('r', snapshotUrl);popoutParams.set('trace', traceUrl);- if (snapshot.point) {- popoutParams.set('pointX', String(snapshot.point.x));- popoutParams.set('pointY', String(snapshot.point.y));- if (snapshot.hasInputTarget)- params.set('hasInputTarget', '1');- }const popoutUrl = new URL(`snapshot.html?${popoutParams.toString()}`, window.location.href).toString();return { snapshotInfoUrl, snapshotUrl, popoutUrl };}diff --git a/tests/library/trace-viewer.spec.ts b/tests/library/trace-viewer.spec.tsindex e42c0faa20..9080a5e68e 100644--- a/tests/library/trace-viewer.spec.ts+++ b/tests/library/trace-viewer.spec.ts@@ -499,7 +499,7 @@ test('should popup snapshot', async ({ page, runAndTrace, server }) => {const popupPromise = traceViewer.page.context().waitForEvent('page');await traceViewer.page.getByTitle('Open snapshot in a new tab').click();const popup = await popupPromise;- await expect(popup.getByText('hello äöü 🙂')).toBeVisible();+ await expect(popup.frameLocator('iframe').getByText('hello äöü 🙂')).toBeVisible();});test('should capture iframe with sandbox attribute', async ({ page, server, runAndTrace }) => {@@ -1421,7 +1421,7 @@ test('should open snapshot in new browser context', async ({ browser, page, runA// doesn't share sw.bundle.jsconst newPage = await browser.newPage();await newPage.goto(popup.url());- await expect(newPage.getByText('hello')).toBeVisible();+ await expect(newPage.frameLocator('iframe').getByText('hello')).toBeVisible();await newPage.close();});