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

fix(screenshot): prioritize passed type over the extension mime (#4251)

Browse source
This commit is contained in:
Pavel Feldman 2020-10-27 00:02:35 -07:00 committed by GitHub
parent e62f27ac47
commit 1ef090c3ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/client/elementHandle.ts
View file

@ -185,8 +185,10 @@ export class ElementHandle<T extends Node = Node> extends JSHandle<T> {
async screenshot(options: channels.ElementHandleScreenshotOptions & { path?: string } = {}): Promise<Buffer> { async screenshot(options: channels.ElementHandleScreenshotOptions & { path?: string } = {}): Promise<Buffer> {
return this._wrapApiCall('elementHandle.screenshot', async () => { return this._wrapApiCall('elementHandle.screenshot', async () => {
const type = determineScreenshotType(options); const copy = { ...options };
const result = await this._elementChannel.screenshot({ ...options, type }); if (!copy.type)
copy.type = determineScreenshotType(options);
const result = await this._elementChannel.screenshot(copy);
const buffer = Buffer.from(result.binary, 'base64'); const buffer = Buffer.from(result.binary, 'base64');
if (options.path) { if (options.path) {
await mkdirIfNeeded(options.path); await mkdirIfNeeded(options.path);

6
src/client/page.ts
View file

@ -457,8 +457,10 @@ export class Page extends ChannelOwner<channels.PageChannel, channels.PageInitia
async screenshot(options: channels.PageScreenshotOptions & { path?: string } = {}): Promise<Buffer> { async screenshot(options: channels.PageScreenshotOptions & { path?: string } = {}): Promise<Buffer> {
return this._wrapApiCall('page.screenshot', async () => { return this._wrapApiCall('page.screenshot', async () => {
const type = determineScreenshotType(options); const copy = { ...options };
const result = await this._channel.screenshot({ ...options, type }); if (!copy.type)
copy.type = determineScreenshotType(options);
const result = await this._channel.screenshot(copy);
const buffer = Buffer.from(result.binary, 'base64'); const buffer = Buffer.from(result.binary, 'base64');
if (options.path) { if (options.path) {
await mkdirIfNeeded(options.path); await mkdirIfNeeded(options.path);

9
test/elementhandle-screenshot.spec.ts
View file

@ -393,4 +393,13 @@ describe('element screenshot', (suite, parameters) => {
await elementHandle.screenshot({path: outputPath}); await elementHandle.screenshot({path: outputPath});
expect(await fs.promises.readFile(outputPath)).toMatchSnapshot('screenshot-element-bounding-box.png'); expect(await fs.promises.readFile(outputPath)).toMatchSnapshot('screenshot-element-bounding-box.png');
}); });
it('should prefer type over extension', async ({page, server}) => {
await page.setViewportSize({width: 500, height: 500});
await page.goto(server.PREFIX + '/grid.html');
await page.evaluate(() => window.scrollBy(50, 100));
const elementHandle = await page.$('.box:nth-of-type(3)');
const buffer = await elementHandle.screenshot({ path: 'file.png', type: 'jpeg' });
expect([buffer[0], buffer[1], buffer[2]]).toEqual([0xFF, 0xD8, 0xFF]);
});
}); });

5
test/page-screenshot.spec.ts
View file

@ -292,6 +292,11 @@ describe('page screenshot', (suite, { browserName, headful }) => {
expect(error.message).toContain('path: unsupported mime type "text/plain"'); expect(error.message).toContain('path: unsupported mime type "text/plain"');
}); });
it('should prefer type over extension', async ({page}) => {
const buffer = await page.screenshot({ path: 'file.png', type: 'jpeg' });
expect([buffer[0], buffer[1], buffer[2]]).toEqual([0xFF, 0xD8, 0xFF]);
});
it('should work with large size', (test, { browserName }) => { it('should work with large size', (test, { browserName }) => {
test.fail(browserName === 'chromium', 'Upstream Chromium bug'); test.fail(browserName === 'chromium', 'Upstream Chromium bug');
}, async ({ page }) => { }, async ({ page }) => {