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

fix(ui): do not fail on clashing groups (#27943)

Browse source 
Fixes https://github.com/microsoft/playwright/issues/27929
This commit is contained in:
Pavel Feldman 2023-11-02 20:50:08 -07:00 committed by GitHub
parent f9c4955fe8
commit e84dd4d708
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
packages/trace-viewer/src/ui/uiModeView.tsx
View file

@ -856,12 +856,12 @@ function createTree(rootSuite: Suite | undefined, loadErrors: TestError[], proje
const visitSuite = (projectName: string, parentSuite: Suite, parentGroup: GroupItem) => {
for (const suite of parentSuite.suites) {
const title = suite.title || '<anonymous>';
let group = parentGroup.children.find(item => item.title === title) as GroupItem | undefined;
let group = parentGroup.children.find(item => item.kind === 'group' && item.title === title) as GroupItem | undefined;
if (!group) {
group = {
kind: 'group',
subKind: 'describe',
id: parentGroup.id + '\x1e' + title,
id: 'suite:' + parentSuite.titlePath().join('\x1e') + '\x1e' + title, // account for anonymous suites
title,
location: suite.location!,
duration: 0,
@ -877,11 +877,11 @@ function createTree(rootSuite: Suite | undefined, loadErrors: TestError[], proje
for (const test of parentSuite.tests) {
const title = test.title;
let testCaseItem = parentGroup.children.find(t => t.title === title) as TestCaseItem;
let testCaseItem = parentGroup.children.find(t => t.kind !== 'group' && t.title === title) as TestCaseItem;
if (!testCaseItem) {
testCaseItem = {
kind: 'case',
id: parentGroup.id + '\x1e' + title,
id: 'test:' + test.titlePath().join('\x1e'),
title,
parent: parentGroup,
children: [],
@ -953,7 +953,7 @@ function filterTree(rootItem: GroupItem, filterText: string, statusFilters: Map<
if (!tokens.every(token => title.includes(token)) && !testCase.tests.some(t => runningTestIds?.has(t.id)))
return false;
testCase.children = (testCase.children as TestItem[]).filter(test => {
return !filtersStatuses || runningTestIds?.has(test.id) || statusFilters.get(test.status);
return !filtersStatuses || runningTestIds?.has(test.test.id) || statusFilters.get(test.status);
});
testCase.tests = (testCase.children as TestItem[]).map(c => c.test);
return !!testCase.children.length;

28
tests/playwright-test/ui-mode-test-tree.spec.ts
View file

@ -242,3 +242,31 @@ test('should collapse all', async ({ runUITest }) => {
► ◯ a.test.ts
`);
});
test('should resolve title conflicts', async ({ runUITest }) => {
const { page } = await runUITest({
'a.test.ts': `
import { test } from '@playwright/test';
test("foo", () => {});
test.describe("foo", () => {
test("bar", () => {});
});
test.describe("foo", () => {
test("bar 2", () => {});
});
`
});
await page.getByTestId('test-tree').getByText('foo').last().click();
await page.keyboard.press('ArrowRight');
await expect.poll(dumpTestTree(page)).toContain(`
▼ ◯ a.test.ts
◯ foo
▼ ◯ foo <=
◯ bar
◯ bar 2
`);
});