microsoft/playwright
1
1
Fork 0
mirror of https://github.com/microsoft/playwright.git synced 2024-11-28 09:23:42 +03:00
Code Issues Projects Releases Wiki Activity

fix(html): don't conflate file names (#33600)

Browse Source
This commit is contained in:
Simon Knott 2024-11-20 10:16:33 +01:00 committed by GitHub
parent 50c8fbf750
commit f1ddd379f3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/playwright/src/reporters/html.ts
View File

@ -241,12 +241,9 @@ class HtmlBuilder {
async build(metadata: Metadata, projectSuites: Suite[], result: FullResult, topLevelErrors: TestError[]): Promise<{ ok: boolean, singleTestId: string | undefined }> {
const data = new Map<string, { testFile: TestFile, testFileSummary: TestFileSummary }>();
for (const projectSuite of projectSuites) {
const testDir = projectSuite.project()!.testDir;
for (const fileSuite of projectSuite.suites) {
const fileName = this._relativeLocation(fileSuite.location)!.file;
// Preserve file ids computed off the testDir.
const relativeFile = path.relative(testDir, fileSuite.location!.file);
const fileId = calculateSha1(toPosixPath(relativeFile)).slice(0, 20);
const fileId = calculateSha1(toPosixPath(fileName)).slice(0, 20);
let fileEntry = data.get(fileId);
if (!fileEntry) {
fileEntry = {

27
tests/playwright-test/reporter-html.spec.ts
View File

@ -2563,6 +2563,33 @@ for (const useIntermediateMergeReport of [true, false] as const) {
await expect(page.locator('#fallback-error')).toContainText('The Playwright Trace Viewer must be loaded over the http:// or https:// protocols.');
await expect(page.locator('#fallback-error')).toContainText(`npx playwright show-report ${reportPath.replace(/\\/g, '\\\\')}`);
});
test('should not collate identical file names in different project directories', async ({ runInlineTest, page }) => {
await runInlineTest({
'playwright.config.ts': `
export default {
projects: [
{ name: 'a', testDir: './tests/a' },
{ name: 'b', testDir: './tests/b' },
],
}
`,
'tests/a/test.spec.ts': `
import { test } from '@playwright/test';
test('passes', ({ page }) => {});
`,
'tests/b/test.spec.ts': `
import { test } from '@playwright/test';
test('passes', ({ page }) => {});
`,
}, { reporter: 'dot,html' }, { PLAYWRIGHT_HTML_OPEN: 'never' });
const reportPath = path.join(test.info().outputPath(), 'playwright-report', 'index.html');
await page.goto(url.pathToFileURL(reportPath).toString());
await expect(page.getByRole('main')).toMatchAriaSnapshot(`
- button "tests/a/test.spec.ts"
- button "tests/b/test.spec.ts"
`);
});
});
}