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(route): match against updated url while chaining (#15112)

Browse Source
This commit is contained in:
Pavel Feldman 2022-06-24 10:48:16 -07:00 committed by GitHub
parent eba2bdffb9
commit ae6f48c4b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 47 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/playwright-core/src/client/browserContext.ts
View File

@ -145,8 +145,10 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
} }
async _onRoute(route: network.Route, request: network.Request) { async _onRoute(route: network.Route, request: network.Request) {
const routeHandlers = this._routes.filter(r => r.matches(request.url())); const routeHandlers = this._routes.slice();
for (const routeHandler of routeHandlers) { for (const routeHandler of routeHandlers) {
if (!routeHandler.matches(request.url()))
continue;
if (routeHandler.willExpire()) if (routeHandler.willExpire())
this._routes.splice(this._routes.indexOf(routeHandler), 1); this._routes.splice(this._routes.indexOf(routeHandler), 1);
const handled = await routeHandler.handle(route, request); const handled = await routeHandler.handle(route, request);

4
packages/playwright-core/src/client/page.ts
View File

@ -179,8 +179,10 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
} }
private async _onRoute(route: Route, request: Request) { private async _onRoute(route: Route, request: Request) {
const routeHandlers = this._routes.filter(r => r.matches(request.url())); const routeHandlers = this._routes.slice();
for (const routeHandler of routeHandlers) { for (const routeHandler of routeHandlers) {
if (!routeHandler.matches(request.url()))
continue;
if (routeHandler.willExpire()) if (routeHandler.willExpire())
this._routes.splice(this._routes.indexOf(routeHandler), 1); this._routes.splice(this._routes.indexOf(routeHandler), 1);
const handled = await routeHandler.handle(route, request); const handled = await routeHandler.handle(route, request);

20
tests/library/browsercontext-route.spec.ts
View File

@ -268,6 +268,26 @@ it('should chain fallback', async ({ context, page, server }) => {
expect(intercepted).toEqual([3, 2, 1]); expect(intercepted).toEqual([3, 2, 1]);
}); });
it('should chain fallback w/ dynamic URL', async ({ context, page, server }) => {
const intercepted = [];
await context.route('**/bar', route => {
intercepted.push(1);
route.fallback({ url: server.EMPTY_PAGE });
});
await context.route('**/foo', route => {
intercepted.push(2);
route.fallback({ url: 'http://localhost/bar' });
});
await context.route('**/empty.html', route => {
intercepted.push(3);
route.fallback({ url: 'http://localhost/foo' });
});
await page.goto(server.EMPTY_PAGE);
expect(intercepted).toEqual([3, 2, 1]);
});
it('should not chain fulfill', async ({ context, page, server }) => { it('should not chain fulfill', async ({ context, page, server }) => {
let failed = false; let failed = false;
await context.route('**/empty.html', route => { await context.route('**/empty.html', route => {

2
tests/page/page-request-fallback.spec.ts
View File

@ -205,7 +205,7 @@ it('should override request url', async ({ page, server }) => {
const request = server.waitForRequest('/global-var.html'); const request = server.waitForRequest('/global-var.html');
let url: string; let url: string;
await page.route('**/foo', route => { await page.route('**/global-var.html', route => {
url = route.request().url(); url = route.request().url();
route.continue(); route.continue();
}); });

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

@ -321,6 +321,26 @@ it('should not work with redirects', async ({ page, server }) => {
expect(chain[i].redirectedTo()).toBe(i ? chain[i - 1] : null); expect(chain[i].redirectedTo()).toBe(i ? chain[i - 1] : null);
}); });
it('should chain fallback w/ dynamic URL', async ({ page, server }) => {
const intercepted = [];
await page.route('**/bar', route => {
intercepted.push(1);
route.fallback({ url: server.EMPTY_PAGE });
});
await page.route('**/foo', route => {
intercepted.push(2);
route.fallback({ url: 'http://localhost/bar' });
});
await page.route('**/empty.html', route => {
intercepted.push(3);
route.fallback({ url: 'http://localhost/foo' });
});
await page.goto(server.EMPTY_PAGE);
expect(intercepted).toEqual([3, 2, 1]);
});
it('should work with redirects for subresources', async ({ page, server }) => { it('should work with redirects for subresources', async ({ page, server }) => {
const intercepted = []; const intercepted = [];
await page.route('**/*', route => { await page.route('**/*', route => {