From afd90123be81e0c3fc6ca05128087cb8d612a750 Mon Sep 17 00:00:00 2001
From: Andrey Lushnikov <aslushnikov@gmail.com>
Date: Mon, 21 Aug 2017 13:34:26 -0700
Subject: [PATCH] waitTask should survive cross-process navigation (#435)

In case of cross-process navigation, we receive a context
which is immediately getting destroyed.

Fixes #396.
---
 lib/FrameManager.js | 5 +++++
 test/test.js        | 7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/FrameManager.js b/lib/FrameManager.js
index 37a993e5..86cac4ad 100644
--- a/lib/FrameManager.js
+++ b/lib/FrameManager.js
@@ -419,6 +419,11 @@ class WaitTask {
     if (error && error.message.includes('Execution context was destroyed'))
       return;
 
+    // We could have tried to evaluate in a context which was already
+    // destroyed.
+    if (error && error.message.includes('Cannot find context with specified id'))
+      return;
+
     if (error)
       this._reject(error);
     else
diff --git a/test/test.js b/test/test.js
index f44af2a3..8a3f3b26 100644
--- a/test/test.js
+++ b/test/test.js
@@ -32,6 +32,7 @@ const OUTPUT_DIR = path.join(__dirname, 'output');
 
 const PORT = 8907;
 const PREFIX = 'http://localhost:' + PORT;
+const CROSS_PROCESS_PREFIX = 'http://127.0.0.1:' + PORT;
 const EMPTY_PAGE = PREFIX + '/empty.html';
 const HTTPS_PORT = 8908;
 const HTTPS_PREFIX = 'https://localhost:' + HTTPS_PORT;
@@ -275,7 +276,7 @@ describe('Page', function() {
       await page.goto(EMPTY_PAGE);
       let mainFrame = page.mainFrame();
       expect(await mainFrame.evaluate(() => window.location.href)).toContain('localhost');
-      await page.goto('http://127.0.0.1:' + PORT + '/empty.html');
+      await page.goto(CROSS_PROCESS_PREFIX + '/empty.html');
       expect(await mainFrame.evaluate(() => window.location.href)).toContain('127');
     }));
   });
@@ -423,14 +424,14 @@ describe('Page', function() {
       expect(waitError).toBeTruthy();
       expect(waitError.message).toContain('waitForSelector failed: frame got detached.');
     }));
-    it('should survive navigation', SX(async function() {
+    it('should survive cross-process navigation', SX(async function() {
       let boxFound = false;
       let waitForSelector = page.waitForSelector('.box').then(() => boxFound = true);
       await page.goto(EMPTY_PAGE);
       expect(boxFound).toBe(false);
       await page.reload();
       expect(boxFound).toBe(false);
-      await page.goto(PREFIX + '/grid.html');
+      await page.goto(CROSS_PROCESS_PREFIX + '/grid.html');
       await waitForSelector;
       expect(boxFound).toBe(true);
     }));