Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix(webkit): correctly report outerWidth/Height on Mac (#3133)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-07-27 16:06:50 -07:00 committed by GitHub
parent 101dd3b120
commit 576e2c5287
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browsers.json
View file

@ -13,7 +13,7 @@
}, },
{ {
"name": "webkit", "name": "webkit",
"revision": "1317", "revision": "1319",
"download": true "download": true
} }
] ]

2
src/chromium/crBrowser.ts
View file

@ -158,7 +158,7 @@ export class CRBrowser extends BrowserBase {
if (targetInfo.type === 'page') { if (targetInfo.type === 'page') {
const opener = targetInfo.openerId ? this._crPages.get(targetInfo.openerId) || null : null; const opener = targetInfo.openerId ? this._crPages.get(targetInfo.openerId) || null : null;
const crPage = new CRPage(session, targetInfo.targetId, context, opener, !!this._options.headful); const crPage = new CRPage(session, targetInfo.targetId, context, opener, true);
this._crPages.set(targetInfo.targetId, crPage); this._crPages.set(targetInfo.targetId, crPage);
crPage.pageOrError().then(pageOrError => { crPage.pageOrError().then(pageOrError => {
const page = crPage._page; const page = crPage._page;

17
test/emulation.jest.js
View file

@ -16,7 +16,7 @@
*/ */
const utils = require('./utils'); const utils = require('./utils');
const {FFOX, HEADLESS} = testOptions; const {CHROMIUM, FFOX, MAC, HEADLESS} = testOptions;
describe('BrowserContext({viewport})', function() { describe('BrowserContext({viewport})', function() {
it('should get the proper default viewport size', async({page, server}) => { it('should get the proper default viewport size', async({page, server}) => {
@ -27,6 +27,21 @@ describe('BrowserContext({viewport})', function() {
await page.setViewportSize({width: 123, height: 456}); await page.setViewportSize({width: 123, height: 456});
await utils.verifyViewport(page, 123, 456); await utils.verifyViewport(page, 123, 456);
}); });
// TODO: enable in Chromium after http://crrev.com/c/2321409 is landed and rolled.
it.fail(CHROMIUM && HEADLESS && MAC)('should return correct outerWidth and outerHeight', async({page}) => {
const size = await page.evaluate(() => {
return {
innerWidth: window.innerWidth,
innerHeight: window.innerHeight,
outerWidth: window.outerWidth,
outerHeight: window.outerHeight,
};
});
expect(size.innerWidth).toBe(1280);
expect(size.innerHeight).toBe(720);
expect(size.outerWidth >= size.innerWidth).toBeTruthy();
expect(size.outerHeight >= size.innerHeight).toBeTruthy();
});
it('should emulate device width', async({page, server}) => { it('should emulate device width', async({page, server}) => {
expect(page.viewportSize()).toEqual({width: 1280, height: 720}); expect(page.viewportSize()).toEqual({width: 1280, height: 720});
await page.setViewportSize({width: 200, height: 200}); await page.setViewportSize({width: 200, height: 200});