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

allow collecting attachments before completing step

Browse source
This commit is contained in:
Simon Knott 2024-10-18 09:42:22 +02:00
parent 2d4d402297
commit 5329341ef2
No known key found for this signature in database
GPG key ID: 8CEDC00028084AEC
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
packages/playwright/src/worker/testInfo.ts
View file

@ -30,7 +30,8 @@ import type { Attachment } from './testTracing';
import type { StackFrame } from '@protocol/channels'; import type { StackFrame } from '@protocol/channels';
export interface TestStepInternal { export interface TestStepInternal {
complete(result: { error?: Error | unknown, attachments?: Attachment[] }): void; complete(result: { error?: Error | unknown }): void;
attachments: Attachment[];
stepId: string; stepId: string;
title: string; title: string;
category: 'hook' | 'fixture' | 'test.step' | 'expect' | 'attach' | string; category: 'hook' | 'fixture' | 'test.step' | 'expect' | 'attach' | string;
@ -248,7 +249,7 @@ export class TestInfoImpl implements TestInfo {
); );
} }
_addStep(data: Omit<TestStepInternal, 'complete' | 'stepId' | 'steps'>): TestStepInternal { _addStep(data: Omit<TestStepInternal, 'complete' | 'stepId' | 'steps' | 'attachments'>): TestStepInternal {
const stepId = `${data.category}@${++this._lastStepId}`; const stepId = `${data.category}@${++this._lastStepId}`;
const parentStep = this._parentStep(data.isStage); const parentStep = this._parentStep(data.isStage);
@ -261,10 +262,12 @@ export class TestInfoImpl implements TestInfo {
} }
data.location = data.location || filteredStack[0]; data.location = data.location || filteredStack[0];
const attachments: Attachment[] = [];
const step: TestStepInternal = { const step: TestStepInternal = {
stepId, stepId,
...data, ...data,
steps: [], steps: [],
attachments,
complete: result => { complete: result => {
if (step.endWallTime) if (step.endWallTime)
return; return;
@ -292,7 +295,7 @@ export class TestInfoImpl implements TestInfo {
} }
} }
for (const attachment of result.attachments ?? []) for (const attachment of attachments ?? [])
this._attach(attachment, stepId); this._attach(attachment, stepId);
const payload: StepEndPayload = { const payload: StepEndPayload = {
@ -303,7 +306,7 @@ export class TestInfoImpl implements TestInfo {
}; };
this._onStepEnd(payload); this._onStepEnd(payload);
const errorForTrace = step.error ? { name: '', message: step.error.message || '', stack: step.error.stack } : undefined; const errorForTrace = step.error ? { name: '', message: step.error.message || '', stack: step.error.stack } : undefined;
this._tracing.appendAfterActionForStep(stepId, errorForTrace, result.attachments); this._tracing.appendAfterActionForStep(stepId, errorForTrace, attachments);
} }
}; };
const parentStepList = parentStep ? parentStep.steps : this._steps; const parentStepList = parentStep ? parentStep.steps : this._steps;
@ -407,7 +410,8 @@ export class TestInfoImpl implements TestInfo {
category: 'attach', category: 'attach',
}); });
const attachment = await normalizeAndSaveAttachment(this.outputPath(), name, options); const attachment = await normalizeAndSaveAttachment(this.outputPath(), name, options);
step.complete({ attachments: [attachment] }); step.attachments.push(attachment);
step.complete({});
} }
private _attach(attachment: TestInfo['attachments'][0], stepId: string | undefined) { private _attach(attachment: TestInfo['attachments'][0], stepId: string | undefined) {