thunderstrike/puppeteer
thunderstrike/puppeteer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(page): respect timeout 0 in page.waitForFunction (#2563)

Browse Source 
The in-page task should not set timeout when timeout is 0.

Fixes #2540.
This commit is contained in:
Andrey Lushnikov 2018-05-25 16:45:04 -07:00 committed by GitHub
parent 6a0627a411
commit debfe7e0b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/FrameManager.js
View File

@ -911,7 +911,8 @@ class WaitTask {
async function waitForPredicatePageFunction(predicateBody, polling, timeout, ...args) { async function waitForPredicatePageFunction(predicateBody, polling, timeout, ...args) {
const predicate = new Function('...args', predicateBody); const predicate = new Function('...args', predicateBody);
let timedOut = false; let timedOut = false;
setTimeout(() => timedOut = true, timeout); if (timeout)
setTimeout(() => timedOut = true, timeout);
if (polling === 'raf') if (polling === 'raf')
return await pollRaf(); return await pollRaf();
if (polling === 'mutation') if (polling === 'mutation')

11
test/frame.spec.js
View File

@ -159,10 +159,13 @@ module.exports.addTests = function({testRunner, expect}) {
expect(error.message).toContain('waiting for function failed: timeout'); expect(error.message).toContain('waiting for function failed: timeout');
}); });
it('should disable timeout when its set to 0', async({page}) => { it('should disable timeout when its set to 0', async({page}) => {
let error = null; const watchdog = page.waitForFunction(() => {
const res = await page.waitForFunction(() => new Promise(res => setTimeout(() => res(42), 100)), {timeout: 0}).catch(e => error = e); window.__counter = (window.__counter || 0) + 1;
expect(error).toBe(null); return window.__injected;
expect(await res.jsonValue()).toBe(42); }, {timeout: 0, polling: 10});
await page.waitForFunction(() => window.__counter > 10);
await page.evaluate(() => window.__injected = true);
await watchdog;
}); });
}); });