Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ export async function openTraceViewerApp(url: string, browserName: string, optio
...options?.persistentContextOptions,
useWebSocket: isUnderTest(),
headless: !!options?.headless,
colorScheme: isUnderTest() ? 'light' : undefined,
},
});

Expand Down
7 changes: 7 additions & 0 deletions tests/config/proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ import net from 'net';
import type { SocksSocketClosedPayload, SocksSocketDataPayload, SocksSocketRequestedPayload } from '../../packages/playwright-core/src/common/socksProxy';
import { SocksProxy } from '../../packages/playwright-core/lib/common/socksProxy';

// Certain browsers perform telemetry requests which we want to ignore.
const kConnectHostsToIgnore = new Set([
'www.bing.com:443',
]);

export class TestProxy {
readonly PORT: number;
readonly URL: string;
Expand Down Expand Up @@ -63,6 +68,8 @@ export class TestProxy {
this._prependHandler('connect', (req: IncomingMessage) => {
if (!options?.allowConnectRequests)
return;
if (kConnectHostsToIgnore.has(req.url))
return;
this.connectHosts.push(req.url);
req.url = `127.0.0.1:${port}`;
});
Expand Down
3 changes: 2 additions & 1 deletion tests/library/browsertype-connect.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ for (const kind of ['launchServer', 'run-server'] as const) {
await browser.close();
});

test('should ignore page.pause when headed', async ({ connect, startRemoteServer, browserType }) => {
test('should ignore page.pause when headed', async ({ connect, startRemoteServer, browserType, channel }) => {
test.skip(channel === 'chromium-headless-shell', 'Headless Shell does not support headed mode');
const headless = (browserType as any)._defaultLaunchOptions.headless;
(browserType as any)._defaultLaunchOptions.headless = false;
const remoteServer = await startRemoteServer(kind);
Expand Down
4 changes: 2 additions & 2 deletions tests/library/channels.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ it('should not generate dispatchers for subresources w/o listeners', async ({ pa
});
});

it('should work with the domain module', async ({ browserType, server, browserName }) => {
it('should work with the domain module', async ({ browserType, server, browserName, channel }) => {
const local = domain.create();
local.run(() => { });
let err;
Expand All @@ -262,7 +262,7 @@ it('should work with the domain module', async ({ browserType, server, browserNa
if (browserName === 'firefox')
expect(message).toBe('CLOSE_ABNORMAL');
else
expect(message).toContain(': 400');
expect(message).toContain(channel?.includes('msedge') ? '' : ': 400');

await browser.close();

Expand Down
3 changes: 2 additions & 1 deletion tests/library/chromium/oopif.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ it('should click a button when it overlays oopif', async function({ page, browse
expect(await page.evaluate(() => (window as any)['BUTTON_CLICKED'])).toBe(true);
});

it('should report google.com frame with headed', async ({ browserType, server }) => {
it('should report google.com frame with headed', async ({ browserType, server, channel }) => {
it.skip(channel === 'chromium-headless-shell', 'Headless Shell does not support headed mode');
// @see https://github.com/GoogleChrome/puppeteer/issues/2548
// https://google.com is isolated by default in Chromium embedder.
const browser = await browserType.launch({ headless: false });
Expand Down
4 changes: 2 additions & 2 deletions tests/library/web-socket.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ it('should emit binary frame events', async ({ page, server }) => {
expect(sent[1][i]).toBe(i);
});

it('should emit error', async ({ page, server, browserName }) => {
it('should emit error', async ({ page, server, browserName, channel }) => {
let callback;
const result = new Promise(f => callback = f);
page.on('websocket', ws => ws.on('socketerror', callback));
Expand All @@ -148,7 +148,7 @@ it('should emit error', async ({ page, server, browserName }) => {
if (browserName === 'firefox')
expect(message).toBe('CLOSE_ABNORMAL');
else
expect(message).toContain(': 400');
expect(message).toContain(channel?.includes('msedge') ? '' : ': 400');
});

it('should not have stray error events', async ({ page, server }) => {
Expand Down