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

fix(eval): be able to throw protocol like errors (#4551)

Browse Source
This commit is contained in:
Joel Einbinder 2019-06-10 17:35:40 -07:00 committed by Andrey Lushnikov
parent 6a50888d34
commit b2f94909a1
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/ExecutionContext.js
View File

@ -42,18 +42,10 @@ class ExecutionContext {
/**
* @param {Function|string} pageFunction
* @param {...*} args
* @return {!Promise<(!Object|undefined)>}
* @return {!Promise<*>}
*/
async evaluate(pageFunction, ...args) {
try {
return await this._evaluateInternal(true /* returnByValue */, pageFunction, ...args);
} catch (error) {
if (error.message.includes('Object reference chain is too long'))
return;
if (error.message.includes('Object couldn\'t be returned by value'))
return;
throw error;
}
return await this._evaluateInternal(true /* returnByValue */, pageFunction, ...args);
}
/**
@ -66,9 +58,10 @@ class ExecutionContext {
}
/**
* @param {boolean} returnByValue
* @param {Function|string} pageFunction
* @param {...*} args
* @return {!Promise<!JSHandle>}
* @return {!Promise<*>}
*/
async _evaluateInternal(returnByValue, pageFunction, ...args) {
const suffix = `//# sourceURL=${EVALUATION_SCRIPT_URL}`;
@ -165,6 +158,11 @@ class ExecutionContext {
* @return {!Protocol.Runtime.evaluateReturnValue}
*/
function rewriteError(error) {
if (error.message.includes('Object reference chain is too long'))
return {result: {type: 'undefined'}};
if (error.message.includes('Object couldn\'t be returned by value'))
return {result: {type: 'undefined'}};
if (error.message.endsWith('Cannot find context with specified id'))
throw new Error('Execution context was destroyed, most likely because of a navigation.');
throw error;

8
test/evaluation.spec.js
View File

@ -182,6 +182,14 @@ module.exports.addTests = function({testRunner, expect}) {
});
expect(result).toBe(undefined);
});
it_fails_ffox('should be able to throw a tricky error', async({page, server}) => {
const windowHandle = await page.evaluateHandle(() => window);
const errorText = await windowHandle.jsonValue().catch(e => e.message);
const error = await page.evaluate(errorText => {
throw new Error(errorText);
}, errorText).catch(e => e);
expect(error.message).toContain(errorText);
});
it('should accept a string', async({page, server}) => {
const result = await page.evaluate('1 + 2');
expect(result).toBe(3);