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

chore: cleanup some har code (#4306)

Browse source 
Drive-by: do not create <root>/file.png in the tests.
This commit is contained in:
Dmitry Gozman 2020-11-02 13:38:55 -08:00 committed by GitHub
parent d117d0bb93
commit c446bf629d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/trace/harTracer.ts
View file

@ -46,13 +46,7 @@ class HarTracer implements ContextListener {
} }
} }
async onContextDidDestroy(context: BrowserContext): Promise<void> { async onContextDidDestroy(context: BrowserContext): Promise<void> { }
const contextTracer = this._contextTracers.get(context);
if (contextTracer) {
this._contextTracers.delete(context);
await contextTracer.flush();
}
}
} }
type HarOptions = { type HarOptions = {
@ -66,7 +60,7 @@ class HarContextTracer {
private _pageEntries = new Map<Page, har.Page>(); private _pageEntries = new Map<Page, har.Page>();
private _entries = new Map<network.Request, har.Entry>(); private _entries = new Map<network.Request, har.Entry>();
private _lastPage = 0; private _lastPage = 0;
private _barrierPromises = new Map<Promise<void>, Page>(); private _barrierPromises = new Set<Promise<void>>();
constructor(context: BrowserContext, options: HarOptions) { constructor(context: BrowserContext, options: HarOptions) {
this._options = options; this._options = options;
@ -135,7 +129,7 @@ class HarContextTracer {
})), })),
promise promise
]) as Promise<void>; ]) as Promise<void>;
this._barrierPromises.set(race, page); this._barrierPromises.add(race);
} }
private _onRequest(page: Page, request: network.Request) { private _onRequest(page: Page, request: network.Request) {
@ -233,7 +227,7 @@ class HarContextTracer {
} }
async flush() { async flush() {
await Promise.all(this._barrierPromises.keys()); await Promise.all(this._barrierPromises);
for (const pageEntry of this._log.pages) { for (const pageEntry of this._log.pages) {
if (pageEntry.pageTimings.onContentLoad >= 0) if (pageEntry.pageTimings.onContentLoad >= 0)
pageEntry.pageTimings.onContentLoad -= pageEntry.startedDateTime.valueOf(); pageEntry.pageTimings.onContentLoad -= pageEntry.startedDateTime.valueOf();

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

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

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

@ -292,8 +292,9 @@ 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}) => { it('should prefer type over extension', async ({page, testInfo}) => {
const buffer = await page.screenshot({ path: 'file.png', type: 'jpeg' }); const outputPath = testInfo.outputPath('file.png');
const buffer = await page.screenshot({ path: outputPath, type: 'jpeg' });
expect([buffer[0], buffer[1], buffer[2]]).toEqual([0xFF, 0xD8, 0xFF]); expect([buffer[0], buffer[1], buffer[2]]).toEqual([0xFF, 0xD8, 0xFF]);
}); });