yujunjun/playwright
1
0
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2025-06-26 21:40:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

cherry-pick(#36377): chore: follow-up to connectOverCDP fetch logic

Browse Source 
Signed-off-by: Max Schmitt <max@schmitt.mx>
This commit is contained in:
Max Schmitt 2025-06-26 19:27:51 +02:00
parent 4d0938cb2e
commit dc1555648b
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/playwright-core/src/server/chromium/chromium.ts
View File

@ -384,7 +384,7 @@ async function urlToWSEndpoint(progress: Progress, endpointURL: string, headers:
progress.log(`<ws preparing> retrieving websocket url from ${endpointURL}`); progress.log(`<ws preparing> retrieving websocket url from ${endpointURL}`);
const url = new URL(endpointURL); const url = new URL(endpointURL);
if (!url.pathname.endsWith('/')) if (!url.pathname.endsWith('/'))
url.pathname = url.pathname + '/'; url.pathname += '/';
url.pathname += 'json/version/'; url.pathname += 'json/version/';
const httpURL = url.toString(); const httpURL = url.toString();

41
tests/library/chromium/connect-over-cdp.spec.ts
View File

@ -41,23 +41,6 @@ test('should connect to an existing cdp session', async ({ browserType, mode },
} }
}); });
test('should connect to an existing cdp session with verbose path', async ({ browserType, mode }, testInfo) => {
const port = 9339 + testInfo.workerIndex;
const browserServer = await browserType.launch({
args: ['--remote-debugging-port=' + port]
});
try {
const cdpBrowser = await browserType.connectOverCDP({
endpointURL: `http://127.0.0.1:${port}/json/version/abcdefg`,
});
const contexts = cdpBrowser.contexts();
expect(contexts.length).toBe(1);
await cdpBrowser.close();
} finally {
await browserServer.close();
}
});
test('should use logger in default context', async ({ browserType }, testInfo) => { test('should use logger in default context', async ({ browserType }, testInfo) => {
test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28813' }); test.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/28813' });
const port = 9339 + testInfo.workerIndex; const port = 9339 + testInfo.workerIndex;
@ -289,6 +272,30 @@ test('should send extra headers with connect request', async ({ browserType, ser
} }
}); });
test('should keep URL parameters when adding json/version', {
annotation: {
type: 'issue',
description: 'https://github.com/microsoft/playwright/issues/36097'
}
}, async ({ browserType, server }) => {
await Promise.all([
server.waitForRequest('/browser/json/version/?foo=bar'),
browserType.connectOverCDP(`http://localhost:${server.PORT}/browser/?foo=bar`).catch(() => {})
]);
});
test('should append /json/version with a slash if there isnt one', {
annotation: {
type: 'issue',
description: 'https://github.com/microsoft/playwright/issues/36378'
}
}, async ({ browserType, server }) => {
await Promise.all([
server.waitForRequest('/browser/json/version/?foo=bar'),
browserType.connectOverCDP(`http://localhost:${server.PORT}/browser?foo=bar`).catch(() => {})
]);
});
test('should send default User-Agent header with connect request', async ({ browserType, server }, testInfo) => { test('should send default User-Agent header with connect request', async ({ browserType, server }, testInfo) => {
{ {
const [request] = await Promise.all([ const [request] = await Promise.all([