From 6350cf08925394d625f76a23dde26ab4ef1dde94 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Wed, 13 Feb 2019 23:22:45 -0800 Subject: [PATCH] fix(firefox): report more console messages (including warnings) (#4005) --- experimental/puppeteer-firefox/lib/Page.js | 2 +- experimental/puppeteer-firefox/package.json | 2 +- test/page.spec.js | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/experimental/puppeteer-firefox/lib/Page.js b/experimental/puppeteer-firefox/lib/Page.js index e3bf288956bf2..e0a9b8c0e40d6 100644 --- 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 index 1dd4b3166c815..224588db015e0 100644 --- 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 index 84c7d4805b38b..395361ecf0be1 100644 --- 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);