From 0d9638fe20ed722639117d12f940458e26a7eb58 Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Fri, 3 Jan 2020 10:07:49 -0800
Subject: [PATCH] feat(webkit): support pageerror event (#362)

---
 src/webkit/wkPage.ts      |  9 ++++++++-
 test/assets/error.html    |  1 +
 test/interception.spec.js | 19 -------------------
 test/page.spec.js         |  2 +-
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/webkit/wkPage.ts b/src/webkit/wkPage.ts
index 315aa8eaea..8a0b4de5ee 100644
--- a/src/webkit/wkPage.ts
+++ b/src/webkit/wkPage.ts
@@ -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;
diff --git a/test/assets/error.html b/test/assets/error.html
index 130400c006..100c1d2dc4 100644
--- a/test/assets/error.html
+++ b/test/assets/error.html
@@ -1,4 +1,5 @@
 <script>
+console.error('Not a JS error');
 a();
 
 function a() {
diff --git a/test/interception.spec.js b/test/interception.spec.js
index 8aee868cc1..3c9d465663 100644
--- a/test/interception.spec.js
+++ b/test/interception.spec.js
@@ -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 => {
diff --git a/test/page.spec.js b/test/page.spec.js
index fed7d988a7..64c39b8a90 100644
--- a/test/page.spec.js
+++ b/test/page.spec.js
@@ -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([