github/puppeteer
0
0
Fork 0
mirror of https://github.com/puppeteer/puppeteer synced 2024-06-14 14:02:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

waitTask should survive cross-process navigation (#435)

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

Fixes #396.
This commit is contained in:
Andrey Lushnikov 2017-08-21 13:34:26 -07:00 committed by GitHub
parent c1731dd5d7
commit afd90123be
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/FrameManager.js
View File

@ -419,6 +419,11 @@ class WaitTask {
if (error && error.message.includes('Execution context was destroyed')) if (error && error.message.includes('Execution context was destroyed'))
return; 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) if (error)
this._reject(error); this._reject(error);
else else

7
test/test.js
View File

@ -32,6 +32,7 @@ const OUTPUT_DIR = path.join(__dirname, 'output');
const PORT = 8907; const PORT = 8907;
const PREFIX = 'http://localhost:' + PORT; const PREFIX = 'http://localhost:' + PORT;
const CROSS_PROCESS_PREFIX = 'http://127.0.0.1:' + PORT;
const EMPTY_PAGE = PREFIX + '/empty.html'; const EMPTY_PAGE = PREFIX + '/empty.html';
const HTTPS_PORT = 8908; const HTTPS_PORT = 8908;
const HTTPS_PREFIX = 'https://localhost:' + HTTPS_PORT; const HTTPS_PREFIX = 'https://localhost:' + HTTPS_PORT;
@ -275,7 +276,7 @@ describe('Page', function() {
await page.goto(EMPTY_PAGE); await page.goto(EMPTY_PAGE);
let mainFrame = page.mainFrame(); let mainFrame = page.mainFrame();
expect(await mainFrame.evaluate(() => window.location.href)).toContain('localhost'); 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'); expect(await mainFrame.evaluate(() => window.location.href)).toContain('127');
})); }));
}); });
@ -423,14 +424,14 @@ describe('Page', function() {
expect(waitError).toBeTruthy(); expect(waitError).toBeTruthy();
expect(waitError.message).toContain('waitForSelector failed: frame got detached.'); 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 boxFound = false;
let waitForSelector = page.waitForSelector('.box').then(() => boxFound = true); let waitForSelector = page.waitForSelector('.box').then(() => boxFound = true);
await page.goto(EMPTY_PAGE); await page.goto(EMPTY_PAGE);
expect(boxFound).toBe(false); expect(boxFound).toBe(false);
await page.reload(); await page.reload();
expect(boxFound).toBe(false); expect(boxFound).toBe(false);
await page.goto(PREFIX + '/grid.html'); await page.goto(CROSS_PROCESS_PREFIX + '/grid.html');
await waitForSelector; await waitForSelector;
expect(boxFound).toBe(true); expect(boxFound).toBe(true);
})); }));