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

fix: throw in route.continue if it is called twice (#11701)

Browse Source
This commit is contained in:
Yury Semikhatsky 2022-01-27 14:58:02 -08:00 committed by GitHub
parent 29a84b2df8
commit d305a2ab3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/playwright-core/src/server/network.ts
View File

@ -238,14 +238,12 @@ export class Route extends SdkObject {
}
async abort(errorCode: string = 'failed') {
assert(!this._handled, 'Route is already handled!');
this._handled = true;
this._startHandling();
await this._delegate.abort(errorCode);
}
async fulfill(overrides: { status?: number, headers?: types.HeadersArray, body?: string, isBase64?: boolean, useInterceptedResponseBody?: boolean, fetchResponseUid?: string }) {
assert(!this._handled, 'Route is already handled!');
this._handled = true;
this._startHandling();
let body = overrides.body;
let isBase64 = overrides.isBase64 || false;
if (body === undefined) {
@ -269,7 +267,7 @@ export class Route extends SdkObject {
}
async continue(overrides: types.NormalizedContinueOverrides = {}) {
assert(!this._handled, 'Route is already handled!');
this._startHandling();
if (overrides.url) {
const newUrl = new URL(overrides.url);
const oldUrl = new URL(this._request.url());
@ -278,6 +276,11 @@ export class Route extends SdkObject {
}
await this._delegate.continue(this._request, overrides);
}
private _startHandling() {
assert(!this._handled, 'Route is already handled!');
this._handled = true;
}
}
export type RouteHandler = (route: Route, request: Request) => void;

10
tests/page/page-request-continue.spec.ts
View File

@ -63,16 +63,18 @@ it('should override request url', async ({ page, server }) => {
});
it('should not allow changing protocol when overriding url', async ({ page, server }) => {
let error: Error | undefined;
let resolve;
const errorPromise = new Promise<Error|null>(f => resolve = f);
await page.route('**/*', async route => {
try {
await route.continue({ url: 'file:///tmp/foo' });
resolve(null);
} catch (e) {
error = e;
await route.continue();
resolve(e);
}
});
await page.goto(server.EMPTY_PAGE);
page.goto(server.EMPTY_PAGE).catch(() => {});
const error = await errorPromise;
expect(error).toBeTruthy();
expect(error.message).toContain('New URL must have same protocol as overridden URL');
});

14
tests/page/page-route.spec.ts
View File

@ -15,6 +15,7 @@
* limitations under the License.
*/
import { Route } from 'playwright-core';
import { test as it, expect } from './pageTest';
it('should intercept #smoke', async ({ page, server }) => {
@ -710,3 +711,16 @@ it('should contain raw response header after fulfill', async ({ page, server })
const headers = await response.allHeaders();
expect(headers['content-type']).toBeTruthy();
});
for (const method of ['fulfill', 'continue', 'abort'] as const) {
it(`route.${method} should throw if called twice`, async ({ page, server }) => {
const routePromise = new Promise<Route>(async resove => {
await page.route('**/*', resove);
});
page.goto(server.PREFIX + '/empty.html').catch(() => {});
const route = await routePromise;
await route[method]();
const e = await route[method]().catch(e => e);
expect(e.message).toContain('Route is already handled!');
});
}