Skip to content

Make tree search match the package path of the test result (fixes #1077) #3416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zocek wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make tree search match the package path of the test result (fixes #1077) #3416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions allure-generator/src/main/javascript/features/tree/model/filter.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ const byText = (text?: string): TreeFilter => {
return (
!normalizedText ||
String(child.name).toLowerCase().indexOf(normalizedText) > -1 ||
(typeof child.searchPath === "string" &&
child.searchPath.toLowerCase().indexOf(normalizedText) > -1) ||
Boolean(child.children?.some(byText(normalizedText)))
);
};
Expand Down
8 changes: 6 additions & 2 deletions allure-generator/src/main/javascript/features/tree/model/treeData.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,21 +149,25 @@ const createLeafOrderMap = (children: TreeNode[] = []) => {
return new Map(sortedLeaves.map((leaf, index) => [leaf, index + 1]));
};

const normalizeNodes = (children: TreeNode[] = []): TreeNode[] => {
const normalizeNodes = (children: TreeNode[] = [], parentPath = ""): TreeNode[] => {
const leafOrders = createLeafOrderMap(children);

return children.map((child) => {
const searchPath = [parentPath, child.name].filter(Boolean).join(".");

if (!child.children) {
return {
...child,
searchPath,
order: leafOrders.get(child),
};
}

const normalizedChildren = normalizeNodes(child.children);
const normalizedChildren = normalizeNodes(child.children, searchPath);

return {
...child,
searchPath,
children: normalizedChildren,
statistic: calculateStatistic(normalizedChildren),
time: calculateTime(normalizedChildren),
Expand Down
1 change: 1 addition & 0 deletions allure-generator/src/main/javascript/types/report.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ export type TestResult = {

export type TreeNode = {
name?: string;
searchPath?: string;
uid?: string;
parentUid?: string;
status?: Status;
Expand Down
2 changes: 2 additions & 0 deletions allure-generator/tests/e2e/support/fixtures.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export const fixtures = {
packages: {
root: "io.qameta.allure",
className: "PullRequestsWebTest",
methodName: "shouldClosePullRequest",
pathQuery: "qameta.allure.PullRequestsWebTest.shouldClose",
},
widgets: {
behaviors: "Features by stories",
Expand Down
18 changes: 18 additions & 0 deletions allure-generator/tests/e2e/tree.shared.spec.mts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ for (const mode of reportModes) {
await searchInput.fill("tag:sm");
await expect(page.locator(".tree__empty")).toHaveText("There are no items");

await searchInput.fill("allure.PullRequestsWebTest");
await expect(
page.locator(".node__leaf", { hasText: uiDemo.cases.failedPullRequest }),
).toBeVisible();

await searchInput.fill(uiDemo.cases.failedPullRequest);
await expect(
page.locator(".node__leaf", { hasText: uiDemo.cases.failedPullRequest }),
Expand Down Expand Up @@ -133,6 +138,19 @@ for (const mode of reportModes) {
await groupLocator(page, uiDemo.packages.root).locator(":scope > .node__title").click();
await expect(groupLocator(page, uiDemo.packages.className)).toBeVisible();
await expect(page.locator(".tree__download")).toHaveCount(0);

const packagesSearchInput = page.locator(".search__input");
await packagesSearchInput.fill(uiDemo.packages.pathQuery);
await expect(groupLocator(page, uiDemo.packages.className)).toBeVisible();
await expect(
page.locator(".node__leaf", { hasText: uiDemo.packages.methodName }),
).toBeVisible();

await packagesSearchInput.fill(uiDemo.packages.root);
await expect(
page.locator(".node__leaf", { hasText: uiDemo.packages.methodName }),
).toBeVisible();
await packagesSearchInput.fill("");
});

test("collapsed groups stay collapsed when selecting leaves in other groups", async ({
Expand Down
Loading