Skip to content

Playwright is a framework for Web Testing and Automation. It allows testing Chromium, Firefox and WebKit with a single API.

chore: resolve unroute all race (#36588)

Pavel Feldman90c6e14ff904
diff --git a/packages/playwright-core/src/client/browserContext.ts b/packages/playwright-core/src/client/browserContext.ts
index 2c7c2ecc43..97170ce041 100644
--- a/packages/playwright-core/src/client/browserContext.ts
+++ b/packages/playwright-core/src/client/browserContext.ts
@@ -395,11 +395,11 @@ export class BrowserContext extends ChannelOwner<channels.BrowserContextChannel>
private async _unrouteInternal(removed: network.RouteHandler[], remaining: network.RouteHandler[], behavior?: 'wait'|'ignoreErrors'|'default'): Promise<void> {
this._routes = remaining;
+ if (behavior && behavior !== 'default') {
+ const promises = removed.map(routeHandler => routeHandler.stop(behavior));
+ await Promise.all(promises);
+ }
await this._updateInterceptionPatterns();
- if (!behavior || behavior === 'default')
- return;
- const promises = removed.map(routeHandler => routeHandler.stop(behavior));
- await Promise.all(promises);
}
private async _updateInterceptionPatterns() {
diff --git a/packages/playwright-core/src/client/page.ts b/packages/playwright-core/src/client/page.ts
index 26a925f680..6245ec6e1d 100644
--- a/packages/playwright-core/src/client/page.ts
+++ b/packages/playwright-core/src/client/page.ts
@@ -561,11 +561,11 @@ export class Page extends ChannelOwner<channels.PageChannel> implements api.Page
private async _unrouteInternal(removed: RouteHandler[], remaining: RouteHandler[], behavior?: 'wait'|'ignoreErrors'|'default'): Promise<void> {
this._routes = remaining;
+ if (behavior && behavior !== 'default') {
+ const promises = removed.map(routeHandler => routeHandler.stop(behavior));
+ await Promise.all(promises);
+ }
await this._updateInterceptionPatterns();
- if (!behavior || behavior === 'default')
- return;
- const promises = removed.map(routeHandler => routeHandler.stop(behavior));
- await Promise.all(promises);
}
private async _updateInterceptionPatterns() {
diff --git a/tests/library/unroute-behavior.spec.ts b/tests/library/unroute-behavior.spec.ts
index b12390b79b..ef58fc6c65 100644
--- a/tests/library/unroute-behavior.spec.ts
+++ b/tests/library/unroute-behavior.spec.ts
@@ -16,6 +16,7 @@
import { browserTest as it, expect } from '../config/browserTest';
import type { Route } from '@playwright/test';
+import { ManualPromise } from '../../packages/playwright-core/lib/utils/isomorphic/manualPromise';
it('context.unroute should not wait for pending handlers to complete', async ({ page, context, server }) => {
it.info().annotations.push({ type: 'issue', description: 'https://github.com/microsoft/playwright/issues/23781' });
@@ -300,3 +301,31 @@ it('route.fulfill should not throw if page has been closed', async ({ page, serv
// Should not throw.
await route.fulfill();
});
+
+it('should not continue requests in flight (page)', async ({ page, server }) => {
+ const routePromise = new ManualPromise();
+ await page.goto(server.EMPTY_PAGE);
+ await page.route('**/*', async route => {
+ routePromise.resolve();
+ await new Promise(f => setTimeout(f, 3000));
+ const response = await route.fetch();
+ await route.fulfill({ response });
+ });
+ void page.evaluate(() => fetch('/')).catch(() => {});
+ await routePromise;
+ await page.unrouteAll({ behavior: 'wait' });
+});
+
+it('should not continue requests in flight (context)', async ({ page, context, server }) => {
+ const routePromise = new ManualPromise();
+ await page.goto(server.EMPTY_PAGE);
+ await context.route('**/*', async route => {
+ routePromise.resolve();
+ await new Promise(f => setTimeout(f, 3000));
+ const response = await route.fetch();
+ await route.fulfill({ response });
+ });
+ void page.evaluate(() => fetch('/')).catch(() => {});
+ await routePromise;
+ await context.unrouteAll({ behavior: 'wait' });
+});