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

feat(html): matching labels with dash&spec symbol (#22709)

Browse source 
Fixes #22700
This commit is contained in:
Alex Neo 2023-05-01 19:13:30 +03:00 committed by GitHub
parent 1168525c07
commit 26cad0b31f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 76 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/html-reporter/src/labelUtils.tsx
View file

@ -25,7 +25,7 @@ export function escapeRegExp(string: string) {
// match all tags in test title
export function matchTags(title: string): string[] {
return title.match(/@(\w+)/g)?.map(tag => tag.slice(1)) || [];
return title.match(/@([\S]+)/g)?.map(tag => tag.slice(1)) || [];
}
// hash string to integer in range [0, 6] for color index, to get same color for same tag

2
packages/html-reporter/src/testCaseView.tsx
View file

@ -88,7 +88,7 @@ const LabelsLinkView: React.FC<React.PropsWithChildren<{
return labels.length > 0 ? (
<>
{labels.map(tag => (
<a style={{ textDecoration: 'none', color: 'var(--color-fg-default)' }} href={`#?q=@${tag}`} >
<a key={tag} style={{ textDecoration: 'none', color: 'var(--color-fg-default)' }} href={`#?q=@${tag}`} >
<span style={{ margin: '6px 0 0 6px', cursor: 'pointer' }} className={'label label-color-' + (hashStringToInt(tag))}>
{tag}
</span>

77
tests/playwright-test/reporter-html.spec.ts
View file

@ -1261,7 +1261,7 @@ test.describe('labels', () => {
expect((await firstTitle.boundingBox()).height).toBeGreaterThanOrEqual(100);
});
test('with describe. should show filtered tests by labels when click on label', async ({ runInlineTest, showReport, page }) => {
test('with describe. with dash. should show filtered tests by labels when click on label', async ({ runInlineTest, showReport, page }) => {
const result = await runInlineTest({
'a.test.js': `
const { expect, test } = require('@playwright/test');
@ -1269,6 +1269,9 @@ test.describe('labels', () => {
test('@regression passes', async ({}) => {
expect(1).toBe(1);
});
test('@GCC-1508 passes', async ({}) => {
expect(1).toBe(1);
});
});
`,
'b.test.js': `
@ -1278,13 +1281,16 @@ test.describe('labels', () => {
test('@smoke fails', async ({}) => {
expect(1).toBe(2);
});
test('@GCC-1510 fails', async ({}) => {
expect(1).toBe(2);
});
});
`,
}, { reporter: 'dot,html' }, { PW_TEST_HTML_REPORT_OPEN: 'never' });
expect(result.exitCode).toBe(1);
expect(result.passed).toBe(1);
expect(result.failed).toBe(1);
expect(result.passed).toBe(2);
expect(result.failed).toBe(2);
await showReport();
@ -1316,6 +1322,71 @@ test.describe('labels', () => {
await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(0);
await expect(page.locator('.test-file-test .test-file-title')).toHaveText('Error Pages › @regression passes');
await searchInput.clear();
const tagWithDash = page.locator('.test-file-test', { has: page.getByText('Error Pages › @GCC-1508 passes', { exact: true }) }).locator('.label', { hasText: 'GCC-1508' });
await tagWithDash.click();
await expect(searchInput).toHaveValue('@GCC-1508');
await expect(page.locator('.test-file-test')).toHaveCount(1);
await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(0);
await expect(page.locator('.test-file-test .test-file-title')).toHaveText('Error Pages › @GCC-1508 passes');
await searchInput.clear();
const tagWithDash2 = page.locator('.test-file-test', { has: page.getByText('Error Pages › @GCC-1510 fails', { exact: true }) }).locator('.label', { hasText: 'GCC-1510' });
await tagWithDash2.click();
await expect(searchInput).toHaveValue('@GCC-1510');
await expect(page.locator('.test-file-test')).toHaveCount(1);
await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(0);
await expect(page.locator('.chip', { hasText: 'b.test.js' })).toHaveCount(1);
await expect(page.locator('.test-file-test .test-file-title')).toHaveText('Error Pages › @GCC-1510 fails');
});
test('tags with special symbols', async ({ runInlineTest, showReport, page }) => {
const result = await runInlineTest({
'a.test.js': `
const { expect, test } = require('@playwright/test');
const tags = ['@smoke:p1', '@issue[123]', '@issue#123', '@$$$', '@tl/dr'];
test.describe('Error Pages', () => {
tags.forEach(tag => {
test(tag + ' passes', async ({}) => {
expect(1).toBe(1);
});
});
});
`,
}, { reporter: 'dot,html' }, { PW_TEST_HTML_REPORT_OPEN: 'never' });
expect(result.exitCode).toBe(0);
expect(result.passed).toBe(5);
await showReport();
const tags = ['smoke:p1', 'issue[123]', 'issue#123', '$$$', 'tl/dr'];
const searchInput = page.locator('.subnav-search-input');
for (const tag of tags) {
const tagButton = page.locator('.label').getByText(tag, { exact: true });
await expect(tagButton).toBeVisible();
await tagButton.click();
await expect(page.locator('.test-file-test')).toHaveCount(1);
await expect(page.locator('.chip')).toHaveCount(1);
await expect(page.locator('.chip', { hasText: 'a.test.js' })).toHaveCount(1);
await expect(page.locator('.test-file-test .test-file-title')).toHaveText(`Error Pages › @${tag} passes`);
const testTitle = page.locator('.test-file-test .test-file-title', { hasText: `${tag} passes` });
await testTitle.click();
await expect(page.locator('.test-case-title', { hasText: `${tag} passes` })).toBeVisible();
await expect(page.locator('.label', { hasText: tag })).toBeVisible();
await page.goBack();
await searchInput.clear();
}
});
test('click label should change URL', async ({ runInlineTest, showReport, page }) => {