Add report for allure-mocha package

packages/allure-mocha/.eslintrc.cjs

@@ -7,7 +7,7 @@ module.exports = {
   overrides: [
     {
       extends: ["plugin:@typescript-eslint/disable-type-checked"],
-      files: [".eslintrc.cjs"],
+      files: [".eslintrc.cjs", "vitest.config.ts", "vitest-setup.ts"],
     },
     {
       files: ["**/*.cjs", "**/*.js"],

packages/allure-mocha/package.json

@@ -38,12 +38,14 @@
     "dist"
   ],
   "scripts": {
+    "allure-report": "allure serve ./out/allure-results",
     "clean": "rimraf ./dist ./out",
     "compile": "run-s 'compile:*'",
     "compile:esm-babel": "babel --config-file ./babel.esm.json ./src --out-dir ./dist/esm --extensions '.ts' --source-maps",
     "compile:cjs-babel": "babel --config-file ./babel.cjs.json ./src --out-dir ./dist/cjs --extensions '.ts' --source-maps",
     "compile:types": "tsc",
     "compile:fixup": "node ./scripts/fixup.mjs",
+    "generate-report": "allure generate ./out/allure-results -o ./out/allure-report --clean",
     "lint": "eslint ./src ./test --ext .ts",
     "lint:fix": "eslint ./src ./test --ext .ts --fix",
     "test": "run-s --print-name 'test:*'",
@@ -68,6 +70,8 @@
     "@types/node": "^20.6.3",
     "@typescript-eslint/eslint-plugin": "^7.0.0",
     "@typescript-eslint/parser": "^7.0.0",
+    "allure-commandline": "^2.29.0",
+    "allure-vitest": "workspace:*",
     "babel-plugin-add-module-exports": "^1.0.4",
     "babel-plugin-transform-import-meta": "^2.2.1",
     "chai": "^4.3.8",
@@ -88,7 +92,7 @@
     "ts-node": "^10.9.1",
     "tslib": "^2.6.2",
     "typescript": "^5.2.2",
-    "vitest": "^1.4.0"
+    "vitest": "^1.6.0"
   },
   "peerDependencies": {
     "mocha": ">=6.2.x"

packages/allure-mocha/test/spec/framework/result.test.ts

@@ -29,9 +29,8 @@ describe("defaults", () => {
   });
 
   it("has timing props", () => {
-    expect(test.start).greaterThan(0);
-    expect(test.stop).greaterThan(test.start as number);
     expect(test.start).greaterThanOrEqual(sampleStart);
+    expect(test.stop).greaterThanOrEqual(test.start as number);
     expect(test.stop).lessThanOrEqual(sampleStop);
   });
 

packages/allure-mocha/test/utils.ts

@@ -3,6 +3,7 @@ import { randomUUID } from "node:crypto";
 import { appendFileSync } from "node:fs";
 import { copyFile, mkdir, readFile, writeFile } from "node:fs/promises";
 import * as path from "node:path";
+import { attachment, attachmentPath, parameter, step } from "allure-js-commons";
 import type { AllureResults, Category } from "allure-js-commons/sdk";
 import { MessageReader } from "allure-js-commons/sdk/reporter";
 
@@ -50,6 +51,10 @@ abstract class AllureMochaTestRunner {
   }
 
   run = async (...samples: readonly (string | readonly string[])[]) => {
+    // TODO parameter should accept any type
+    await parameter("parallel", `${RUN_IN_PARALLEL}`);
+    await parameter("module", SPEC_FORMAT);
+
     const testDir = path.join(this.runResultsDir, randomUUID());
 
     const filesToCopy = [...this.getFilesToCopy(testDir)];
@@ -73,49 +78,61 @@ abstract class AllureMochaTestRunner {
     const cmdContent = [scriptPath, ...scriptArgs].join("\n  ");
 
     await mkdir(testDir, { recursive: true });
-    await Promise.all([
-      ...filesToCopy.map(async ([src, dst]) => {
+    for (const [src, dst] of filesToCopy) {
+      const name = path.basename(dst);
+      await step(name, async () => {
         const dstDir = path.dirname(dst);
         await mkdir(dstDir, { recursive: true });
         await copyFile(src, dst);
-      }),
-      ...filesToTransform.map(async ([src, dst, uncomment]) => {
+        await attachmentPath(name, src, { contentType: "text/plain" });
+      });
+    }
+
+    for (const [src, dst, uncomment] of filesToTransform) {
+      const name = path.basename(dst);
+      await step(name, async () => {
         const dstDir = path.dirname(dst);
         const content = await readFile(src, { encoding: "utf-8" });
         await mkdir(dstDir, { recursive: true });
         const uncommentedSample = content.replace(uncomment, "$1");
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        writeFile(dst, uncommentedSample, { encoding: "utf-8" });
-      }),
-      writeFile(cmdPath, cmdContent, "utf-8"),
-    ]);
+        await writeFile(dst, uncommentedSample, { encoding: "utf-8" });
+        await attachment(name, uncommentedSample, { contentType: "text/plain" });
+      });
+    }
+
+    await step(path.basename(cmdPath), async () => {
+      await writeFile(cmdPath, cmdContent, "utf-8");
+    });
 
     if (this.config.testplan) {
       const testplanPath = path.join(testDir, "testplan.json");
       this.config.env ??= {};
       this.config.env.ALLURE_TESTPLAN_PATH = testplanPath;
       const selectorPrefix = path.relative(path.join(__dirname, ".."), testDir);
-      await writeFile(
-        testplanPath,
-        JSON.stringify({
-          version: "1.0",
-          tests: this.config.testplan.map((test) => ({
-            id: test.id,
-            selector: test.selector ? this.resolveTestplanSelector(selectorPrefix, test.selector) : undefined,
-          })),
-        }),
-        { encoding: "utf-8" },
-      );
+      const content = JSON.stringify({
+        version: "1.0",
+        tests: this.config.testplan.map((test) => ({
+          id: test.id,
+          selector: test.selector ? this.resolveTestplanSelector(selectorPrefix, test.selector) : undefined,
+        })),
+      });
+      await writeFile(testplanPath, content, { encoding: "utf-8" });
+      await attachment(path.basename(testplanPath), content, {
+        contentType: "application/json",
+        fileExtension: "json",
+      });
     }
 
-    const testProcess = fork(scriptPath, scriptArgs, {
-      env: {
-        ...process.env,
-        ...this.config.env,
-        ALLURE_MOCHA_TESTHOST_PID: process.pid.toString(),
-      },
-      cwd: testDir,
-      stdio: "pipe",
+    const testProcess = await step(`${scriptPath} ${scriptArgs.join(" ")}`, () => {
+      return fork(scriptPath, scriptArgs, {
+        env: {
+          ...process.env,
+          ...this.config.env,
+          ALLURE_MOCHA_TESTHOST_PID: process.pid.toString(),
+        },
+        cwd: testDir,
+        stdio: "pipe",
+      });
     });
 
     const messageReader = new MessageReader();
@@ -133,7 +150,8 @@ abstract class AllureMochaTestRunner {
     });
 
     return await new Promise<AllureResults>((resolve, reject) => {
-      testProcess.on("exit", (code, signal) => {
+      testProcess.on("exit", async (code, signal) => {
+        await messageReader.attachResults();
         if ((code ?? -1) >= 0 && !signal) {
           resolve(messageReader.results);
         } else if (signal) {

packages/allure-mocha/vitest-setup.ts

@@ -0,0 +1 @@
+import "allure-vitest/setup";

packages/allure-mocha/vitest.config.mts

@@ -6,8 +6,9 @@ export default defineConfig({
     fileParallelism: false,
     testTimeout: 25000,
     hookTimeout: 25000,
-    reporters: ["default"],
     globalSetup: ["./test/setup.ts"],
+    setupFiles: ["./vitest-setup.ts"],
+    reporters: ["default", ["allure-vitest/reporter", { resultsDir: "./out/allure-results" }]],
     typecheck: {
       enabled: true,
       tsconfig: "./tsconfig.test.json",

yarn.lock

@@ -4442,7 +4442,9 @@ __metadata:
     "@types/node": "npm:^20.6.3"
     "@typescript-eslint/eslint-plugin": "npm:^7.0.0"
     "@typescript-eslint/parser": "npm:^7.0.0"
+    allure-commandline: "npm:^2.29.0"
     allure-js-commons: "workspace:*"
+    allure-vitest: "workspace:*"
     babel-plugin-add-module-exports: "npm:^1.0.4"
     babel-plugin-transform-import-meta: "npm:^2.2.1"
     chai: "npm:^4.3.8"
@@ -4463,7 +4465,7 @@ __metadata:
     ts-node: "npm:^10.9.1"
     tslib: "npm:^2.6.2"
     typescript: "npm:^5.2.2"
-    vitest: "npm:^1.4.0"
+    vitest: "npm:^1.6.0"
   peerDependencies:
     mocha: ">=6.2.x"
   languageName: unknown