Skip to content

Commit

Permalink
cherry-pick(release-1.12): do not stall on dialogs
Browse files Browse the repository at this point in the history
Cherry-Pick microsoft#7059 SHA cbce7cb

Fixes microsoft#7048
  • Loading branch information
pavelfeldman authored and aslushnikov committed Jun 11, 2021
1 parent 770cbb9 commit f6c4198
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/server/trace/recorder/tracing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { CallMetadata, InstrumentationListener, SdkObject } from '../../instrume
import { Page } from '../../page';
import * as trace from '../common/traceEvents';
import { TraceSnapshotter } from './traceSnapshotter';
import { Dialog } from '../../dialog';

export type TracerOptions = {
name?: string;
Expand Down Expand Up @@ -128,6 +129,13 @@ export class Tracing implements InstrumentationListener {
return;
if (!this._snapshotter.started())
return;

if (sdkObject instanceof Dialog && name === 'before') {
// A call on the dialog is going to dismiss it and resume the evaluation.
// We can't be capturing the snapshot before dismiss action is performed.
return;
}

const snapshotName = `${name}@${metadata.id}`;
metadata.snapshots.push({ title: name, snapshotName });
await this._snapshotter!.captureSnapshot(sdkObject.attribution.page, snapshotName, element);
Expand Down
15 changes: 15 additions & 0 deletions tests/tracing.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,21 @@ test('should collect two traces', async ({ context, page, server }, testInfo) =>
}
});

test('should not stall on dialogs', async ({ page, context, server }) => {
await context.tracing.start({ screenshots: true, snapshots: true });
await page.goto(server.EMPTY_PAGE);

page.on('dialog', async dialog => {
await dialog.accept();
});

await page.evaluate(() => {
confirm('are you sure');
});
await context.tracing.stop();
});


for (const params of [
{
id: 'fit',
Expand Down

0 comments on commit f6c4198

Please sign in to comment.