@allurereport/plugin-classic 3.0.0-beta.6 → 3.0.0-beta.8

package/dist/converters.js

@@ -24,7 +24,7 @@ const convertStep = (context, step) => {
         const stepsCount = steps.length;
         const parameters = step.parameters;
         const parametersCount = parameters.length;
-        const statusMessage = step.message;
+        const statusMessage = step.error?.message;
         const shouldDisplayMessage = !!statusMessage || steps.findIndex((s) => s.statusMessage === statusMessage) > 0;
         return {
             name,
@@ -35,7 +35,7 @@ const convertStep = (context, step) => {
             },
             status: step.status,
             statusMessage,
-            statusTrace: step.trace,
+            statusTrace: step.error?.trace,
             steps,
             attachments: [],
             parameters,
@@ -101,14 +101,14 @@ export const convertTestResult = (context, test) => {
     const severity = extractSeverity(test);
     const tags = findAllLabels(test, "tag");
     const status = convertStatus(test.status);
-    const statusMessage = test.message;
-    const statusTrace = test.trace;
+    const statusMessage = test.error?.message;
+    const statusTrace = test.error?.trace;
     const flaky = false;
     const categories = matchCategories(context.categories, { statusMessage, statusTrace, status, flaky });
     const retries = context.retries.map((retry) => ({
         uid: retry.id,
         status: convertStatus(retry.status),
-        statusDetails: retry.message,
+        statusDetails: retry?.error?.message,
         time: {
             start: retry.start,
             stop: retry.stop,
@@ -125,7 +125,7 @@ export const convertTestResult = (context, test) => {
         uid: htr.id,
         status: convertStatus(htr.status),
         reportUrl: "unsupported",
-        statusDetails: htr.message,
+        statusDetails: htr.error?.message,
         time: {
             start: htr.start,
             stop: htr.stop,

package/dist/plugin.d.ts

@@ -1,4 +1,4 @@
-import type { AllureStore, Plugin, PluginContext } from "@allurereport/plugin-api";
+import { type AllureStore, type Plugin, type PluginContext } from "@allurereport/plugin-api";
 import type { Allure2PluginOptions } from "./model.js";
 export declare class Allure2Plugin implements Plugin {
     #private;

package/dist/plugin.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _Allure2Plugin_generate;
+import { preciseTreeLabels } from "@allurereport/plugin-api";
 import { convertTestResult } from "./converters.js";
 import { generateAttachmentsData, generateCategoriesData, generateDefaultWidgetData, generateEmptyTrendData, generateEnvironmentJson, generateExecutorJson, generatePackagesData, generateStaticFiles, generateSummaryJson, generateTestResults, generateTimelineData, generateTree, generateTrendData, } from "./generators.js";
 import { InMemoryReportDataWriter, ReportFileDataWriter } from "./writer.js";
@@ -34,8 +35,14 @@ export class Allure2Plugin {
             }
             await generateTestResults(writer, allTr);
             const displayedTr = allTr.filter((atr) => !atr.hidden);
-            await generateTree(writer, "suites", ["parentSuite", "suite", "subSuite"], displayedTr);
-            await generateTree(writer, "behaviors", ["epic", "feature", "story"], displayedTr);
+            const treeLabelNamesFactory = (labelNames) => preciseTreeLabels(labelNames, displayedTr, (tr) => {
+                if (tr.labels) {
+                    return tr.labels.map(({ name }) => name);
+                }
+                return [];
+            });
+            await generateTree(writer, "suites", treeLabelNamesFactory(["parentSuite", "suite", "subSuite"]), displayedTr);
+            await generateTree(writer, "behaviors", treeLabelNamesFactory(["epic", "feature", "story"]), displayedTr);
             await generatePackagesData(writer, displayedTr);
             await generateCategoriesData(writer, displayedTr);
             await generateTimelineData(writer, allTr);

package/dist/tree.js

@@ -1,5 +1,4 @@
-import { byStatistic } from "@allurereport/core-api";
-import { compareBy } from "@allurereport/core-api";
+import { byStatistic, compareBy } from "@allurereport/core-api";
 import { createHash } from "node:crypto";
 import { calculateStatisticByLeafs } from "./utils.js";
 const rootNodeUid = "__ROOT__";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/plugin-classic",
-  "version": "3.0.0-beta.6",
+  "version": "3.0.0-beta.8",
   "description": "The classic version of Allure HTML report",
   "keywords": [
     "allure",
@@ -30,10 +30,10 @@
     "test": "rimraf ./out && vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.6",
-    "@allurereport/plugin-api": "3.0.0-beta.6",
-    "@allurereport/web-classic": "3.0.0-beta.6",
-    "@allurereport/web-commons": "3.0.0-beta.6",
+    "@allurereport/core-api": "3.0.0-beta.8",
+    "@allurereport/plugin-api": "3.0.0-beta.8",
+    "@allurereport/web-classic": "3.0.0-beta.8",
+    "@allurereport/web-commons": "3.0.0-beta.8",
     "handlebars": "^4.7.8"
   },
   "devDependencies": {
@@ -43,7 +43,7 @@
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
     "@vitest/runner": "^2.1.8",
-    "allure-vitest": "^3.0.7",
+    "allure-vitest": "^3.0.9",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-import": "^2.29.1",