fix(firefox): report more console messages (including warnings) (#4005)

puppeteer · Feb 14, 2019 · 6350cf0 · 6350cf0
1 parent 0b40d04
commit 6350cf0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/experimental/puppeteer-firefox/lib/Page.js b/experimental/puppeteer-firefox/lib/Page.js
@@ -80,7 +80,7 @@ class Page extends EventEmitter {
     this._networkManager.setFrameManager(this._frameManager);
     this._eventListeners = [
       helper.addEventListener(this._session, 'Page.uncaughtError', this._onUncaughtError.bind(this)),
-      helper.addEventListener(this._session, 'Page.consoleAPICalled', this._onConsole.bind(this)),
+      helper.addEventListener(this._session, 'Page.console', this._onConsole.bind(this)),
       helper.addEventListener(this._session, 'Page.dialogOpened', this._onDialogOpened.bind(this)),
       helper.addEventListener(this._session, 'Browser.tabClosed', this._onClosed.bind(this)),
       helper.addEventListener(this._frameManager, Events.FrameManager.Load, () => this.emit(Events.Page.Load)),

diff --git a/experimental/puppeteer-firefox/package.json b/experimental/puppeteer-firefox/package.json
@@ -9,7 +9,7 @@
     "node": ">=8.9.4"
   },
   "puppeteer": {
-    "firefox_revision": "4ba5b441257d5938d032d09fc09e45ea9d8f2e3a"
+    "firefox_revision": "fd017c27c17d0b4fa8bdea3ad40b88ca2addaeda"
   },
   "scripts": {
     "install": "node install.js",

diff --git a/test/page.spec.js b/test/page.spec.js
@@ -333,14 +333,17 @@ module.exports.addTests = function({testRunner, expect, headless, Errors, Device
       ]);
       expect(message.text()).toBe('JSHandle@object');
     });
-    it_fails_ffox('should trigger correct Log', async({page, server}) => {
+    it('should trigger correct Log', async({page, server}) => {
       await page.goto('about:blank');
       const [message] = await Promise.all([
         waitEvent(page, 'console'),
         page.evaluate(async url => fetch(url).catch(e => {}), server.EMPTY_PAGE)
       ]);
-      expect(message.text()).toContain('No \'Access-Control-Allow-Origin\'');
-      expect(message.type()).toEqual('error');
+      expect(message.text()).toContain('Access-Control-Allow-Origin');
+      if (CHROME)
+        expect(message.type()).toEqual('error');
+      else
+        expect(message.type()).toEqual('warn');
     });
     it_fails_ffox('should have location when fetch fails', async({page, server}) => {
       await page.goto(server.EMPTY_PAGE);