Skip to content

Commit

Permalink
feat(chromium): roll Chromium to r568432 (#2769)
Browse files Browse the repository at this point in the history
This roll includes:
- https://crrev.com/568341 - DevTools: force-create execution contexts for mixed content iframes

Fixes #2709.
  • Loading branch information
aslushnikov committed Jun 19, 2018
1 parent ea8ec1e commit dcae6bc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"node": ">=6.4.0"
},
"puppeteer": {
"chromium_revision": "567388"
"chromium_revision": "568432"
},
"scripts": {
"unit": "node test/test.js",
Expand Down
5 changes: 5 additions & 0 deletions test/ignorehttpserrors.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ module.exports.addTests = function({testRunner, expect, PROJECT_ROOT, defaultBro
res.end(`<iframe src=${server.EMPTY_PAGE}></iframe>`);
});
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);
});
});
};

1 comment on commit dcae6bc

@paambaati
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aslushnikov Congratulations on the 1000th commit!

Please sign in to comment.