From dcae6bcff49150bec2060667fef7bd7ab71db042 Mon Sep 17 00:00:00 2001 From: Andrey Lushnikov Date: Tue, 19 Jun 2018 13:46:08 -0700 Subject: [PATCH] feat(chromium): roll Chromium to r568432 (#2769) This roll includes: - https://crrev.com/568341 - DevTools: force-create execution contexts for mixed content iframes Fixes #2709. --- package.json | 2 +- test/ignorehttpserrors.spec.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index b016c37ef73..26f7f859494 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "node": ">=6.4.0" }, "puppeteer": { - "chromium_revision": "567388" + "chromium_revision": "568432" }, "scripts": { "unit": "node test/test.js", diff --git a/test/ignorehttpserrors.spec.js b/test/ignorehttpserrors.spec.js index ed55356d400..ec5b0c67289 100644 --- a/test/ignorehttpserrors.spec.js +++ b/test/ignorehttpserrors.spec.js @@ -58,6 +58,11 @@ module.exports.addTests = function({testRunner, expect, PROJECT_ROOT, defaultBro res.end(``); }); await page.goto(httpsServer.PREFIX + '/mixedcontent.html', {waitUntil: 'load'}); + expect(page.frames().length).toBe(2); + // Make sure blocked iframe has functional execution context + // @see https://github.com/GoogleChrome/puppeteer/issues/2709 + expect(await page.frames()[0].evaluate('1 + 2')).toBe(3); + expect(await page.frames()[1].evaluate('2 + 3')).toBe(5); }); }); };