@allurereport/core 3.0.0-beta.12 → 3.0.0-beta.14

package/dist/plugin.js

@@ -11,7 +11,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _DefaultPluginState_state, _PluginFiles_parent, _PluginFiles_pluginId, _InMemoryReportFiles_state, _FileSystemReportFiles_output;
 import { mkdir, writeFile } from "node:fs/promises";
-import { dirname, join, resolve } from "node:path";
+import { dirname, resolve } from "node:path";
+import { join as joinPosix } from "node:path/posix";
 export class DefaultPluginState {
     constructor(state) {
         _DefaultPluginState_state.set(this, void 0);
@@ -33,7 +34,7 @@ export class PluginFiles {
         _PluginFiles_parent.set(this, void 0);
         _PluginFiles_pluginId.set(this, void 0);
         this.addFile = async (key, data) => {
-            await __classPrivateFieldGet(this, _PluginFiles_parent, "f").addFile(join(__classPrivateFieldGet(this, _PluginFiles_pluginId, "f"), key), data);
+            await __classPrivateFieldGet(this, _PluginFiles_parent, "f").addFile(joinPosix(__classPrivateFieldGet(this, _PluginFiles_pluginId, "f"), key), data);
         };
         __classPrivateFieldSet(this, _PluginFiles_parent, parent, "f");
         __classPrivateFieldSet(this, _PluginFiles_pluginId, pluginId, "f");

package/dist/report.js

@@ -17,7 +17,7 @@ import console from "node:console";
 import { randomUUID } from "node:crypto";
 import { EventEmitter } from "node:events";
 import { readFileSync } from "node:fs";
-import { opendir, readdir, realpath, rename, rm } from "node:fs/promises";
+import { lstat, opendir, readdir, realpath, rename, rm } from "node:fs/promises";
 import { dirname, join, resolve } from "node:path";
 import { createHistory, writeHistory } from "./history.js";
 import { DefaultPluginState, PluginFiles } from "./plugin.js";
@@ -126,7 +126,7 @@ export class AllureReport {
                 }
                 summaries.push({
                     ...summary,
-                    href: join("/", id),
+                    href: `${id}/`,
                 });
             });
             if (__classPrivateFieldGet(this, _AllureReport_appendHistory, "f")) {
@@ -136,8 +136,13 @@ export class AllureReport {
                 await writeHistory(__classPrivateFieldGet(this, _AllureReport_historyPath, "f"), historyDataPoint);
             }
             const outputDirFiles = await readdir(__classPrivateFieldGet(this, _AllureReport_output, "f"));
-            if (outputDirFiles.length === 1) {
-                const reportPath = join(__classPrivateFieldGet(this, _AllureReport_output, "f"), outputDirFiles[0]);
+            if (outputDirFiles.length === 0) {
+                return;
+            }
+            const reportPath = join(__classPrivateFieldGet(this, _AllureReport_output, "f"), outputDirFiles[0]);
+            const outputEntriesStats = await Promise.all(outputDirFiles.map((file) => lstat(join(__classPrivateFieldGet(this, _AllureReport_output, "f"), file))));
+            const outputDirectoryEntries = outputEntriesStats.filter((entry) => entry.isDirectory());
+            if (outputDirectoryEntries.length === 1) {
                 const reportContent = await readdir(reportPath);
                 for (const entry of reportContent) {
                     const currentFilePath = join(reportPath, entry);
@@ -147,10 +152,9 @@ export class AllureReport {
                 await rm(reportPath, { recursive: true });
                 return;
             }
-            if (summaries.length === 0) {
-                return;
+            if (summaries.length > 1) {
+                await generateSummary(__classPrivateFieldGet(this, _AllureReport_output, "f"), summaries);
             }
-            await generateSummary(__classPrivateFieldGet(this, _AllureReport_output, "f"), summaries);
         };
         _AllureReport_eachPlugin.set(this, async (initState, consumer) => {
             if (initState) {

package/dist/store/convert.js

@@ -181,7 +181,7 @@ const convertStep = (stateData, step) => {
             stepId: md5(`${step.name}${step.start}`),
             name: step.name ?? __unknown,
             status: step.status ?? defaultStatus,
-            steps: convertSteps(stateData, step.steps),
+            steps: subSteps,
             parameters: convertParameters(step.parameters),
             ...processTimings(step),
             type: "step",

package/dist/store/store.d.ts

@@ -43,8 +43,9 @@ export declare class DefaultAllureStore implements AllureStore, ResultsVisitor {
     metadataByKey<T>(key: string): Promise<T | undefined>;
     testResultsByTcId(tcId: string): Promise<TestResult[]>;
     attachmentsByTrId(trId: string): Promise<AttachmentLink[]>;
-    retriesByTr(tr: TestResult): TestResult[];
+    retriesByTr(tr: TestResult): Promise<TestResult[]>;
     retriesByTrId(trId: string): Promise<TestResult[]>;
+    historyByTr(tr: TestResult): Promise<HistoryTestResult[]>;
     historyByTrId(trId: string): Promise<HistoryTestResult[]>;
     fixturesByTrId(trId: string): Promise<TestFixtureResult[]>;
     failedTestResults(): Promise<TestResult[]>;

package/dist/store/store.js

@@ -12,6 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _DefaultAllureStore_testResults, _DefaultAllureStore_attachments, _DefaultAllureStore_attachmentContents, _DefaultAllureStore_testCases, _DefaultAllureStore_metadata, _DefaultAllureStore_history, _DefaultAllureStore_known, _DefaultAllureStore_fixtures, _DefaultAllureStore_defaultLabels, _DefaultAllureStore_environmentsConfig, _DefaultAllureStore_reportVariables, _DefaultAllureStore_eventEmitter;
 import { compareBy, getWorstStatus, matchEnvironment, nullsLast, ordinal, reverse, } from "@allurereport/core-api";
 import { md5 } from "@allurereport/plugin-api";
+import { isFlaky } from "../utils/flaky.js";
 import { getTestResultsStats } from "../utils/stats.js";
 import { testFixtureResultRawToState, testResultRawToState } from "./convert.js";
 const index = (indexMap, key, ...items) => {
@@ -86,6 +87,8 @@ export class DefaultAllureStore {
             });
         }
         testResult.environment = matchEnvironment(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"), testResult);
+        const trHistory = await this.historyByTr(testResult);
+        testResult.flaky = isFlaky(testResult, trHistory);
         __classPrivateFieldGet(this, _DefaultAllureStore_testResults, "f").set(testResult.id, testResult);
         if (testResult.historyId) {
             const maybeOther = this.indexLatestEnvTestResultByHistoryId
@@ -200,7 +203,7 @@ export class DefaultAllureStore {
     async attachmentsByTrId(trId) {
         return this.indexAttachmentByTestResult.get(trId) ?? [];
     }
-    retriesByTr(tr) {
+    async retriesByTr(tr) {
         if (!tr || tr.hidden || !tr.historyId) {
             return [];
         }
@@ -210,13 +213,9 @@ export class DefaultAllureStore {
     }
     async retriesByTrId(trId) {
         const tr = await this.testResultById(trId);
-        if (!tr) {
-            return [];
-        }
-        return this.retriesByTr(tr);
+        return tr ? this.retriesByTr(tr) : [];
     }
-    async historyByTrId(trId) {
-        const tr = await this.testResultById(trId);
+    async historyByTr(tr) {
         if (!tr?.historyId) {
             return [];
         }
@@ -224,6 +223,10 @@ export class DefaultAllureStore {
             .filter((dp) => !!dp.testResults[tr.historyId])
             .map((dp) => ({ ...dp.testResults[tr.historyId] }));
     }
+    async historyByTrId(trId) {
+        const tr = await this.testResultById(trId);
+        return tr ? this.historyByTr(tr) : [];
+    }
     async fixturesByTrId(trId) {
         return this.indexFixturesByTestResult.get(trId) ?? [];
     }
@@ -261,11 +264,16 @@ export class DefaultAllureStore {
     }
     async testsStatistic(filter) {
         const all = await this.allTestResults();
-        const allWithRetries = all.map((tr) => ({
-            ...tr,
-            retries: this.retriesByTr(tr),
+        const allWithStats = await Promise.all(all.map(async (tr) => {
+            const trHistory = await this.historyByTr(tr);
+            const retries = await this.retriesByTr(tr);
+            return {
+                ...tr,
+                flaky: isFlaky(tr, trHistory),
+                retries,
+            };
         }));
-        return getTestResultsStats(allWithRetries, filter);
+        return getTestResultsStats(allWithStats, filter);
     }
     async allEnvironments() {
         return Array.from(new Set(["default", ...Object.keys(__classPrivateFieldGet(this, _DefaultAllureStore_environmentsConfig, "f"))]));

package/dist/utils/flaky.d.ts

@@ -0,0 +1,2 @@
+import type { HistoryTestResult, TestResult } from "@allurereport/core-api";
+export declare const isFlaky: (tr: TestResult, history: HistoryTestResult[]) => boolean;

package/dist/utils/flaky.js

@@ -0,0 +1,12 @@
+const MAX_LAST_HISTORY_SIZE = 5;
+const badStatuses = ["failed", "broken"];
+const isAllureClassicFlaky = (tr, history) => {
+    if (history.length === 0 || !badStatuses.includes(tr.status)) {
+        return false;
+    }
+    const limitedLastHistory = history.slice(-MAX_LAST_HISTORY_SIZE);
+    const limitedLastHistoryStatuses = limitedLastHistory.map((h) => h.status);
+    return (limitedLastHistoryStatuses.includes("passed") &&
+        limitedLastHistoryStatuses.indexOf("passed") < limitedLastHistoryStatuses.lastIndexOf("failed"));
+};
+export const isFlaky = (tr, history) => tr.flaky || isAllureClassicFlaky(tr, history);

package/dist/utils/stats.js

@@ -7,6 +7,9 @@ export const getTestResultsStats = (trs, filter = () => true) => {
         if (tr.retries && tr.retries?.length > 0) {
             acc.retries = (acc.retries ?? 0) + 1;
         }
+        if (tr.flaky) {
+            acc.flaky = (acc.flaky ?? 0) + 1;
+        }
         if (!acc[tr.status]) {
             acc[tr.status] = 0;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@allurereport/core",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.14",
   "description": "Collection of generic Allure utilities used across the entire project",
   "keywords": [
     "allure"
@@ -25,20 +25,20 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@allurereport/core-api": "3.0.0-beta.12",
-    "@allurereport/plugin-allure2": "3.0.0-beta.12",
-    "@allurereport/plugin-api": "3.0.0-beta.12",
-    "@allurereport/plugin-awesome": "3.0.0-beta.12",
-    "@allurereport/plugin-classic": "3.0.0-beta.12",
-    "@allurereport/plugin-csv": "3.0.0-beta.12",
-    "@allurereport/plugin-dashboard": "3.0.0-beta.12",
-    "@allurereport/plugin-log": "3.0.0-beta.12",
-    "@allurereport/plugin-progress": "3.0.0-beta.12",
-    "@allurereport/plugin-slack": "3.0.0-beta.12",
-    "@allurereport/plugin-testplan": "3.0.0-beta.12",
-    "@allurereport/reader": "3.0.0-beta.12",
-    "@allurereport/reader-api": "3.0.0-beta.12",
-    "@allurereport/summary": "3.0.0-beta.12",
+    "@allurereport/core-api": "3.0.0-beta.14",
+    "@allurereport/plugin-allure2": "3.0.0-beta.14",
+    "@allurereport/plugin-api": "3.0.0-beta.14",
+    "@allurereport/plugin-awesome": "3.0.0-beta.14",
+    "@allurereport/plugin-classic": "3.0.0-beta.14",
+    "@allurereport/plugin-csv": "3.0.0-beta.14",
+    "@allurereport/plugin-dashboard": "3.0.0-beta.14",
+    "@allurereport/plugin-log": "3.0.0-beta.14",
+    "@allurereport/plugin-progress": "3.0.0-beta.14",
+    "@allurereport/plugin-slack": "3.0.0-beta.14",
+    "@allurereport/plugin-testplan": "3.0.0-beta.14",
+    "@allurereport/reader": "3.0.0-beta.14",
+    "@allurereport/reader-api": "3.0.0-beta.14",
+    "@allurereport/summary": "3.0.0-beta.14",
     "handlebars": "^4.7.8",
     "markdown-it": "^14.1.0"
   },