From f420cbb52827724a5e5ed77d0e3dbbfb9c69eccb Mon Sep 17 00:00:00 2001
From: Dmitry Gozman <dgozman@gmail.com>
Date: Thu, 26 Mar 2020 15:55:01 -0700
Subject: [PATCH] test: fix race in 'should respect routes from browser
 context' test (#1559)

We should await the popup, otherwise there is no guarantee that
request has already happened.
---
 test/popup.spec.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/popup.spec.js b/test/popup.spec.js
index 854165d995..fe066be77b 100644
--- a/test/popup.spec.js
+++ b/test/popup.spec.js
@@ -141,7 +141,7 @@ module.exports.describe = function({testRunner, expect, playwright, CHROMIUM, WE
       await context.close();
       expect(size).toEqual({width: 400, height: 500});
     });
-    it.fail(FFOX)('should respect routes from browser context', async function({browser, server}) {
+    it('should respect routes from browser context', async function({browser, server}) {
       const context = await browser.newContext();
       const page = await context.newPage();
       await page.goto(server.EMPTY_PAGE);
@@ -150,9 +150,12 @@ module.exports.describe = function({testRunner, expect, playwright, CHROMIUM, WE
         route.continue();
         intercepted = true;
       });
-      await page.evaluate(url => window.__popup = window.open(url), server.EMPTY_PAGE);
-      await context.close();
+      await Promise.all([
+        page.waitForEvent('popup'),
+        page.evaluate(url => window.__popup = window.open(url), server.EMPTY_PAGE),
+      ]);
       expect(intercepted).toBe(true);
+      await context.close();
     });
     it('should apply addInitScript from browser context', async function({browser, server}) {
       const context = await browser.newContext();