Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: unflake the network status test (#23551)

Browse source
This commit is contained in:
Pavel Feldman 2023-06-06 16:55:53 -07:00 committed by GitHub
parent 1cd8f7543b
commit 7579572688
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
packages/playwright-core/src/client/network.ts
View file

@ -420,6 +420,7 @@ export class Route extends ChannelOwner<channels.RouteChannel> implements api.Ro
method: options.method, method: options.method,
headers: options.headers ? headersObjectToArray(options.headers) : undefined, headers: options.headers ? headersObjectToArray(options.headers) : undefined,
postData: options.postDataBuffer, postData: options.postDataBuffer,
isFallback: internal,
})); }));
}, !!internal); }, !!internal);
} }

1
packages/playwright-core/src/protocol/validator.ts
View file

@ -2003,6 +2003,7 @@ scheme.RouteContinueParams = tObject({
headers: tOptional(tArray(tType('NameValue'))), headers: tOptional(tArray(tType('NameValue'))),
postData: tOptional(tBinary), postData: tOptional(tBinary),
requestUrl: tString, requestUrl: tString,
isFallback: tBoolean,
}); });
scheme.RouteContinueResult = tOptional(tObject({})); scheme.RouteContinueResult = tOptional(tObject({}));
scheme.RouteFulfillParams = tObject({ scheme.RouteFulfillParams = tObject({

1
packages/playwright-core/src/server/dispatchers/networkDispatchers.ts
View file

@ -132,6 +132,7 @@ export class RouteDispatcher extends Dispatcher<Route, channels.RouteChannel, Re
method: params.method, method: params.method,
headers: params.headers, headers: params.headers,
postData: params.postData, postData: params.postData,
isFallback: params.isFallback,
}); });
} }

2
packages/playwright-core/src/server/network.ts
View file

@ -323,7 +323,7 @@ export class Route extends SdkObject {
} }
this._request._setOverrides(overrides); this._request._setOverrides(overrides);
await this._delegate.continue(this._request, overrides); await this._delegate.continue(this._request, overrides);
if (Object.values(overrides).some(value => value !== undefined)) if (!overrides.isFallback)
this._request._context.emit(BrowserContext.Events.RequestContinued, this._request); this._request._context.emit(BrowserContext.Events.RequestContinued, this._request);
this._endHandling(); this._endHandling();
} }

1
packages/playwright-core/src/server/types.ts
View file

@ -146,6 +146,7 @@ export type NormalizedContinueOverrides = {
method?: string, method?: string,
headers?: HeadersArray, headers?: HeadersArray,
postData?: Buffer, postData?: Buffer,
isFallback?: boolean,
}; };
export type EmulatedSize = { viewport: Size, screen: Size }; export type EmulatedSize = { viewport: Size, screen: Size };

2
packages/playwright-test/src/worker/testInfo.ts
View file

@ -228,7 +228,7 @@ export class TestInfoImpl implements TestInfo {
} }
_addStep(data: Omit<TestStepInternal, 'complete' | 'stepId' | 'steps'>, parentStep?: TestStepInternal): TestStepInternal { _addStep(data: Omit<TestStepInternal, 'complete' | 'stepId' | 'steps'>, parentStep?: TestStepInternal): TestStepInternal {
const stepId = `${data.category}@${data.title}@${++this._lastStepId}`; const stepId = `${data.category}@${++this._lastStepId}`;
if (!parentStep) if (!parentStep)
parentStep = zones.zoneData<TestStepInternal>('stepZone', captureRawStack()) || undefined; parentStep = zones.zoneData<TestStepInternal>('stepZone', captureRawStack()) || undefined;

1
packages/protocol/src/channels.ts
View file

@ -3562,6 +3562,7 @@ export type RouteContinueParams = {
headers?: NameValue[], headers?: NameValue[],
postData?: Binary, postData?: Binary,
requestUrl: string, requestUrl: string,
isFallback: boolean,
}; };
export type RouteContinueOptions = { export type RouteContinueOptions = {
url?: string, url?: string,

1
packages/protocol/src/protocol.yml
View file

@ -2818,6 +2818,7 @@ Route:
items: NameValue items: NameValue
postData: binary? postData: binary?
requestUrl: string requestUrl: string
isFallback: boolean
fulfill: fulfill:
parameters: parameters:

1
packages/trace-viewer/src/ui/workbench.css
View file

@ -66,6 +66,7 @@ body.dark-mode .drop-target {
} }
.progress { .progress {
flex: none;
width: 100%; width: 100%;
height: 3px; height: 3px;
margin-top: -3px; margin-top: -3px;

27
tests/library/trace-viewer.spec.ts
View file

@ -31,7 +31,6 @@ test.beforeAll(async function recordTrace({ browser, browserName, browserType, s
const context = await browser.newContext(); const context = await browser.newContext();
await context.tracing.start({ name: 'test', screenshots: true, snapshots: true, sources: true }); await context.tracing.start({ name: 'test', screenshots: true, snapshots: true, sources: true });
const page = await context.newPage(); const page = await context.newPage();
await page.route('**/style.css', route => route.abort());
await page.goto(`data:text/html,<html>Hello world</html>`); await page.goto(`data:text/html,<html>Hello world</html>`);
await page.setContent('<button>Click</button>'); await page.setContent('<button>Click</button>');
await expect(page.locator('button')).toHaveText('Click'); await expect(page.locator('button')).toHaveText('Click');
@ -102,7 +101,6 @@ test('should open simple trace viewer', async ({ showTraceViewer }) => {
const traceViewer = await showTraceViewer([traceFile]); const traceViewer = await showTraceViewer([traceFile]);
await expect(traceViewer.actionTitles).toHaveText([ await expect(traceViewer.actionTitles).toHaveText([
/browserContext.newPage/, /browserContext.newPage/,
/page.route/,
/page.gotodata:text\/html,<html>Hello world<\/html>/, /page.gotodata:text\/html,<html>Hello world<\/html>/,
/page.setContent/, /page.setContent/,
/expect.toHaveTextlocator\('button'\)/, /expect.toHaveTextlocator\('button'\)/,
@ -115,7 +113,6 @@ test('should open simple trace viewer', async ({ showTraceViewer }) => {
/page.waitForResponse/, /page.waitForResponse/,
/page.waitForTimeout/, /page.waitForTimeout/,
/page.gotohttp:\/\/localhost:\d+\/frames\/frame.html/, /page.gotohttp:\/\/localhost:\d+\/frames\/frame.html/,
/route.abort/,
/page.setViewportSize/, /page.setViewportSize/,
]); ]);
}); });
@ -220,10 +217,32 @@ test('should have network requests', async ({ showTraceViewer }) => {
await traceViewer.selectAction('http://localhost'); await traceViewer.selectAction('http://localhost');
await traceViewer.showNetworkTab(); await traceViewer.showNetworkTab();
await expect(traceViewer.networkRequests).toContainText([/200GETframe.htmltext\/html/]); await expect(traceViewer.networkRequests).toContainText([/200GETframe.htmltext\/html/]);
await expect(traceViewer.networkRequests).toContainText([/aborted.*style.cssx-unknown/]); await expect(traceViewer.networkRequests).toContainText([/200GETstyle.csstext\/css/]);
await expect(traceViewer.networkRequests).toContainText([/200GETscript.jsapplication\/javascript/]); await expect(traceViewer.networkRequests).toContainText([/200GETscript.jsapplication\/javascript/]);
}); });
test('should have network request overrides', async ({ page, server, runAndTrace }) => {
const traceViewer = await runAndTrace(async () => {
await page.route('**/style.css', route => route.abort());
await page.goto(server.PREFIX + '/frames/frame.html');
});
await traceViewer.selectAction('http://localhost');
await traceViewer.showNetworkTab();
await expect(traceViewer.networkRequests).toContainText([/200GETframe.htmltext\/html/]);
await expect(traceViewer.networkRequests).toContainText([/abort.*style.cssx-unknown/]);
});
test('should have network request overrides 2', async ({ page, server, runAndTrace }) => {
const traceViewer = await runAndTrace(async () => {
await page.route('**/script.js', route => route.continue());
await page.goto(server.PREFIX + '/frames/frame.html');
});
await traceViewer.selectAction('http://localhost');
await traceViewer.showNetworkTab();
await expect(traceViewer.networkRequests).toContainText([/200GETframe.htmltext\/html/]);
await expect(traceViewer.networkRequests).toContainText([/continue.*script.jsapplication\/javascript/]);
});
test('should show snapshot URL', async ({ page, runAndTrace, server }) => { test('should show snapshot URL', async ({ page, runAndTrace, server }) => {
const traceViewer = await runAndTrace(async () => { const traceViewer = await runAndTrace(async () => {
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);

3
tests/library/tracing.spec.ts
View file

@ -637,7 +637,8 @@ test('should store postData for global request', async ({ request, server }, tes
})); }));
}); });
test('should not flush console events', async ({ context, page }, testInfo) => { test('should not flush console events', async ({ context, page, mode }, testInfo) => {
test.skip(mode === 'service', 'Uses artifactsFolderName');
const testId = test.info().testId; const testId = test.info().testId;
await context.tracing.start({ name: testId }); await context.tracing.start({ name: testId });
const promise = new Promise<void>(f => { const promise = new Promise<void>(f => {