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

fix(network): process last inserted routes first in request interception (#7585)

Browse source
This commit is contained in:
Max Schmitt 2021-07-13 20:22:01 +02:00 committed by GitHub
parent ee0b16b087
commit 767e22c6b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/browserContext.ts
View file

@ -254,7 +254,7 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel,
async route(url: URLMatch, handler: network.RouteHandler): Promise<void> { async route(url: URLMatch, handler: network.RouteHandler): Promise<void> {
return this._wrapApiCall(async (channel: channels.BrowserContextChannel) => { return this._wrapApiCall(async (channel: channels.BrowserContextChannel) => {
this._routes.push({ url, handler }); this._routes.unshift({ url, handler });
if (this._routes.length === 1) if (this._routes.length === 1)
await channel.setNetworkInterceptionEnabled({ enabled: true }); await channel.setNetworkInterceptionEnabled({ enabled: true });
}); });

2
src/client/page.ts
View file

@ -444,7 +444,7 @@ export class Page extends ChannelOwner<channels.PageChannel, channels.PageInitia
async route(url: URLMatch, handler: RouteHandler): Promise<void> { async route(url: URLMatch, handler: RouteHandler): Promise<void> {
return this._wrapApiCall(async (channel: channels.PageChannel) => { return this._wrapApiCall(async (channel: channels.PageChannel) => {
this._routes.push({ url, handler }); this._routes.unshift({ url, handler });
if (this._routes.length === 1) if (this._routes.length === 1)
await channel.setNetworkInterceptionEnabled({ enabled: true }); await channel.setNetworkInterceptionEnabled({ enabled: true });
}); });

18
tests/browsercontext-route.spec.ts
View file

@ -45,11 +45,10 @@ it('should unroute', async ({browser, server}) => {
const page = await context.newPage(); const page = await context.newPage();
let intercepted = []; let intercepted = [];
const handler1 = route => { await context.route('**/*', route => {
intercepted.push(1); intercepted.push(1);
route.continue(); route.continue();
}; });
await context.route('**/empty.html', handler1);
await context.route('**/empty.html', route => { await context.route('**/empty.html', route => {
intercepted.push(2); intercepted.push(2);
route.continue(); route.continue();
@ -58,22 +57,23 @@ it('should unroute', async ({browser, server}) => {
intercepted.push(3); intercepted.push(3);
route.continue(); route.continue();
}); });
await context.route('**/*', route => { const handler4 = route => {
intercepted.push(4); intercepted.push(4);
route.continue(); route.continue();
}); };
await context.route('**/empty.html', handler4);
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
expect(intercepted).toEqual([1]); expect(intercepted).toEqual([4]);
intercepted = []; intercepted = [];
await context.unroute('**/empty.html', handler1); await context.unroute('**/empty.html', handler4);
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
expect(intercepted).toEqual([2]); expect(intercepted).toEqual([3]);
intercepted = []; intercepted = [];
await context.unroute('**/empty.html'); await context.unroute('**/empty.html');
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
expect(intercepted).toEqual([4]); expect(intercepted).toEqual([1]);
await context.close(); await context.close();
}); });

18
tests/page/page-route.spec.ts
View file

@ -39,11 +39,10 @@ it('should intercept', async ({page, server}) => {
it('should unroute', async ({page, server}) => { it('should unroute', async ({page, server}) => {
let intercepted = []; let intercepted = [];
const handler1 = route => { await page.route('**/*', route => {
intercepted.push(1); intercepted.push(1);
route.continue(); route.continue();
}; });
await page.route('**/empty.html', handler1);
await page.route('**/empty.html', route => { await page.route('**/empty.html', route => {
intercepted.push(2); intercepted.push(2);
route.continue(); route.continue();
@ -52,22 +51,23 @@ it('should unroute', async ({page, server}) => {
intercepted.push(3); intercepted.push(3);
route.continue(); route.continue();
}); });
await page.route('**/*', route => { const handler4 = route => {
intercepted.push(4); intercepted.push(4);
route.continue(); route.continue();
}); };
await page.route('**/empty.html', handler4);
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
expect(intercepted).toEqual([1]); expect(intercepted).toEqual([4]);
intercepted = []; intercepted = [];
await page.unroute('**/empty.html', handler1); await page.unroute('**/empty.html', handler4);
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
expect(intercepted).toEqual([2]); expect(intercepted).toEqual([3]);
intercepted = []; intercepted = [];
await page.unroute('**/empty.html'); await page.unroute('**/empty.html');
await page.goto(server.EMPTY_PAGE); await page.goto(server.EMPTY_PAGE);
expect(intercepted).toEqual([4]); expect(intercepted).toEqual([1]);
}); });
it('should work when POST is redirected with 302', async ({page, server}) => { it('should work when POST is redirected with 302', async ({page, server}) => {