diff --git a/packages/html-reporter/src/types.ts b/packages/html-reporter/src/types.ts index d7ada9cbe6..733e88e8b9 100644 --- a/packages/html-reporter/src/types.ts +++ b/packages/html-reporter/src/types.ts @@ -66,7 +66,6 @@ export type TestCaseSummary = { title: string; path: string[]; projectName: string; - botName?: string; location: Location; annotations: TestCaseAnnotation[]; tags: string[]; diff --git a/packages/playwright/src/reporters/merge.ts b/packages/playwright/src/reporters/merge.ts index 57398ebc4e..1aba179549 100644 --- a/packages/playwright/src/reporters/merge.ts +++ b/packages/playwright/src/reporters/merge.ts @@ -381,8 +381,7 @@ class IdsPatcher { } private _onProject(project: JsonProject) { - project.metadata = project.metadata ?? {}; - project.metadata.botName = this._botName; + project.metadata ??= {}; project.suites.forEach(suite => this._updateTestIds(suite)); } diff --git a/tests/playwright-test/reporter-blob.spec.ts b/tests/playwright-test/reporter-blob.spec.ts index e12ec3c069..e57d8ff223 100644 --- a/tests/playwright-test/reporter-blob.spec.ts +++ b/tests/playwright-test/reporter-blob.spec.ts @@ -1198,44 +1198,6 @@ test('support fileName option', async ({ runInlineTest, mergeReports }) => { expect(reportFiles.sort()).toEqual(['report-one.zip', 'report-two.zip']); }); -test('preserve reportName on projects', async ({ runInlineTest, mergeReports }) => { - const files = (reportName: string) => ({ - 'echo-reporter.js': ` - import fs from 'fs'; - - class EchoReporter { - onBegin(config, suite) { - const projects = suite.suites.map(s => s.project()).sort((a, b) => a.metadata.botName.localeCompare(b.metadata.botName)); - console.log('projectNames: ' + projects.map(p => p.name)); - console.log('botNames: ' + projects.map(p => p.metadata.botName)); - } - } - module.exports = EchoReporter; - `, - 'playwright.config.ts': ` - module.exports = { - reporter: [['blob', { fileName: '${reportName}.zip' }]], - projects: [ - { name: 'foo' }, - ] - }; - `, - 'a.test.js': ` - import { test, expect } from '@playwright/test'; - test('math 1 @smoke', async ({}) => {}); - `, - }); - - await runInlineTest(files('first'), undefined, { PWTEST_BOT_NAME: 'first' }); - await runInlineTest(files('second'), undefined, { PWTEST_BOT_NAME: 'second', PWTEST_BLOB_DO_NOT_REMOVE: '1' }); - - const reportDir = test.info().outputPath('blob-report'); - const { exitCode, output } = await mergeReports(reportDir, {}, { additionalArgs: ['--reporter', test.info().outputPath('echo-reporter.js')] }); - expect(exitCode).toBe(0); - expect(output).toContain(`projectNames: foo,foo`); - expect(output).toContain(`botNames: first,second`); -}); - test('keep projects with same name different bot name separate', async ({ runInlineTest, mergeReports, showReport, page }) => { const files = (reportName: string) => ({ 'playwright.config.ts': `