feat(webkit): support pageerror event (#362)

This commit is contained in:
Pavel Feldman 2020-01-03 10:07:49 -08:00 committed by Dmitry Gozman
parent a09235a6e3
commit 0d9638fe20
4 changed files with 10 additions and 21 deletions

View file

@ -213,7 +213,7 @@ export class WKPage implements PageDelegate {
}
async _onConsoleMessage(event: Protocol.Console.messageAddedPayload) {
const { type, level, text, parameters, url, line: lineNumber, column: columnNumber } = event.message;
const { type, level, text, parameters, url, line: lineNumber, column: columnNumber, source } = event.message;
if (level === 'debug' && parameters && parameters[0].value === BINDING_CALL_MESSAGE) {
const parsedObjectId = JSON.parse(parameters[1].objectId);
const context = this._contextIdToContext.get(parsedObjectId.injectedScriptId);
@ -226,6 +226,13 @@ export class WKPage implements PageDelegate {
(context._delegate as WKExecutionContext)._jsonStringifyObjectId = parameters[1].objectId;
return;
}
if (level === 'error' && source === 'javascript') {
const error = new Error(text);
error.stack = '';
this._page.emit(Events.Page.PageError, error);
return;
}
let derivedType: string = type;
if (type === 'log')
derivedType = level;

View file

@ -1,4 +1,5 @@
<script>
console.error('Not a JS error');
a();
function a() {

View file

@ -439,25 +439,6 @@ module.exports.describe = function({testRunner, expect, defaultBrowserOptions, p
expect(response.statusText()).toBe('Unprocessable Entity');
expect(await page.evaluate(() => document.body.textContent)).toBe('Yo, page!');
});
it.skip(WEBKIT)('should redirect', async({page, server}) => {
await page.setRequestInterception(true);
page.on('request', request => {
if (!request.url().includes('rrredirect')) {
request.continue();
return;
}
request.fulfill({
status: 302,
headers: {
location: server.EMPTY_PAGE,
},
});
});
const response = await page.goto(server.PREFIX + '/rrredirect');
expect(response.request().redirectChain().length).toBe(1);
expect(response.request().redirectChain()[0].url()).toBe(server.PREFIX + '/rrredirect');
expect(response.url()).toBe(server.EMPTY_PAGE);
});
it('should allow mocking binary responses', async({page, server}) => {
await page.setRequestInterception(true);
page.on('request', request => {

View file

@ -509,7 +509,7 @@ module.exports.describe = function({testRunner, expect, headless, playwright, FF
});
describe('Page.Events.PageError', function() {
it.skip(WEBKIT)('should fire', async({page, server}) => {
it('should fire', async({page, server}) => {
let error = null;
page.once('pageerror', e => error = e);
await Promise.all([