ortoni-report 1.1.2 → 1.1.4

package/dist/ortoni-report.d.ts

@@ -1,9 +1,27 @@
-import { Reporter, FullConfig, Suite, TestCase, TestResult, FullResult } from '@playwright/test/reporter';
+import { TestStep, Reporter, FullConfig, Suite, TestCase, TestResult, FullResult } from '@playwright/test/reporter';
 
-interface ReporterConfig {
+interface OrtoniReportConfig {
     projectName?: string;
     authorName?: string;
     testType?: string;
+    preferredTheme?: 'light' | 'dark';
+}
+
+interface TestResultData {
+    retry: string;
+    isRetry: number;
+    projectName: any;
+    suite: any;
+    title: string;
+    status: "passed" | "failed" | "timedOut" | "skipped" | "interrupted" | "expected" | "unexpected" | "flaky";
+    flaky: string;
+    duration: string;
+    errors: any[];
+    steps: TestStep[];
+    logs: string;
+    screenshotPath: string | null;
+    filePath: any;
+    projects: Set<string>;
 }
 
 declare class OrtoniReport implements Reporter {
@@ -11,13 +29,13 @@ declare class OrtoniReport implements Reporter {
     private groupedResults;
     private suiteName;
     private config;
-    constructor(config?: ReporterConfig);
+    constructor(config?: OrtoniReportConfig);
     onBegin(config: FullConfig, suite: Suite): void;
     onTestBegin(test: TestCase, result: TestResult): void;
+    private projectSet;
     onTestEnd(test: TestCase, result: TestResult): void;
-    private _successRate;
     onEnd(result: FullResult): void;
-    generateHTML(): string;
+    generateHTML(filteredResults: TestResultData[], totalDuration: string): string;
 }
 
-export { OrtoniReport as default };
+export { OrtoniReportConfig, OrtoniReport as default };

package/dist/ortoni-report.js

@@ -30,7 +30,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/ortoni-report.ts
 var ortoni_report_exports = {};
 __export(ortoni_report_exports, {
-  default: () => ortoni_report_default
+  default: () => OrtoniReport
 });
 module.exports = __toCommonJS(ortoni_report_exports);
 var import_fs = __toESM(require("fs"));
@@ -45,11 +45,22 @@ function msToTime(duration) {
   const seconds = Math.floor(duration / 1e3 % 60);
   const minutes = Math.floor(duration / (1e3 * 60) % 60);
   const hours = Math.floor(duration / (1e3 * 60 * 60) % 24);
-  const hoursStr = hours < 10 ? "0" + hours : hours;
-  const minutesStr = minutes < 10 ? "0" + minutes : minutes;
-  const secondsStr = seconds < 10 ? "0" + seconds : seconds;
-  const millisecondsStr = milliseconds < 100 ? "0" + milliseconds : milliseconds;
-  return `${hoursStr}:${minutesStr}:${secondsStr}.${millisecondsStr}`;
+  let result = "";
+  if (hours > 0) {
+    result += `${hours}h:`;
+  }
+  if (minutes > 0 || hours > 0) {
+    result += `${minutes < 10 ? "0" + minutes : minutes}m:`;
+  }
+  if (seconds > 0 || minutes > 0 || hours > 0) {
+    result += `${seconds < 10 ? "0" + seconds : seconds}s`;
+  }
+  if (milliseconds > 0 && !(seconds > 0 || minutes > 0 || hours > 0)) {
+    result += `${milliseconds}ms`;
+  } else if (milliseconds > 0) {
+    result += `:${milliseconds < 100 ? "0" + milliseconds : milliseconds}ms`;
+  }
+  return result;
 }
 function normalizeFilePath(filePath) {
   const normalizedPath = import_path.default.normalize(filePath);
@@ -67,16 +78,11 @@ function formatDate(date) {
 var OrtoniReport = class {
   constructor(config = {}) {
     this.results = [];
-    this._successRate = "";
+    this.projectSet = /* @__PURE__ */ new Set();
     this.config = config;
   }
   onBegin(config, suite) {
     this.results = [];
-    const screenshotsDir = import_path2.default.resolve(process.cwd(), "screenshots");
-    if (import_fs.default.existsSync(screenshotsDir)) {
-      import_fs.default.rmSync(screenshotsDir, { recursive: true, force: true });
-    }
-    import_fs.default.mkdirSync(screenshotsDir, { recursive: true });
   }
   onTestBegin(test, result) {
   }
@@ -85,46 +91,45 @@ var OrtoniReport = class {
     if (test.outcome() === "flaky") {
       status = "flaky";
     }
+    this.projectSet.add(test.titlePath()[1]);
     const testResult = {
+      retry: result.retry > 0 ? "retry" : "",
       isRetry: result.retry,
-      totalDuration: "",
       projectName: test.titlePath()[1],
-      // Get the project name
       suite: test.titlePath()[3],
-      // Adjust the index based on your suite hierarchy
       title: test.title,
       status,
       flaky: test.outcome(),
       duration: msToTime(result.duration),
       errors: result.errors.map((e) => import_safe.default.strip(e.message || e.toString())),
       steps: result.steps.map((step) => ({
-        title: step.title,
+        titlePath: step.titlePath,
         category: step.category,
         duration: step.duration,
-        status: result.status
+        error: step.error,
+        location: step.location,
+        parent: step.parent,
+        startTime: step.startTime,
+        steps: step.steps,
+        title: step.title
       })),
       logs: import_safe.default.strip(result.stdout.concat(result.stderr).map((log) => log).join("\n")),
       screenshotPath: null,
-      filePath: normalizeFilePath(test.titlePath()[2])
+      filePath: normalizeFilePath(test.titlePath()[2]),
+      projects: this.projectSet
     };
     if (result.attachments) {
-      const screenshotsDir = import_path2.default.resolve(process.cwd(), "screenshots", test.id);
-      if (!import_fs.default.existsSync(screenshotsDir)) {
-        import_fs.default.mkdirSync(screenshotsDir, { recursive: true });
-      }
       const screenshot = result.attachments.find((attachment) => attachment.name === "screenshot");
       if (screenshot && screenshot.path) {
         const screenshotContent = import_fs.default.readFileSync(screenshot.path, "base64");
-        const screenshotFileName = import_path2.default.join("screenshots", test.id, import_path2.default.basename(screenshot.path));
-        import_fs.default.writeFileSync(import_path2.default.resolve(process.cwd(), screenshotFileName), screenshotContent, "base64");
-        testResult.screenshotPath = screenshotFileName;
+        testResult.screenshotPath = screenshotContent;
       }
     }
     this.results.push(testResult);
   }
   onEnd(result) {
-    this._successRate = (this.results.filter((r) => r.status === "passed").length / this.results.length * 100).toFixed(2);
-    this.results[0].totalDuration = msToTime(result.duration);
+    const filteredResults = this.results.filter((r) => r.status !== "skipped" && !r.isRetry);
+    const totalDuration = msToTime(result.duration);
     this.groupedResults = this.results.reduce((acc, result2, index) => {
       const filePath = result2.filePath;
       const suiteName = result2.suite;
@@ -160,29 +165,37 @@ var OrtoniReport = class {
     import_handlebars.default.registerHelper("gt", function(a, b) {
       return a > b;
     });
-    const html = this.generateHTML();
+    const html = this.generateHTML(filteredResults, totalDuration);
     const outputPath = import_path2.default.resolve(process.cwd(), "ortoni-report.html");
     import_fs.default.writeFileSync(outputPath, html);
     console.log(`Ortoni HTML report generated at ${outputPath}`);
   }
-  generateHTML() {
+  generateHTML(filteredResults, totalDuration) {
+    const totalTests = filteredResults.length;
+    const passedTests = this.results.filter((r) => r.status === "passed").length;
+    const flakyTests = this.results.filter((r) => r.flaky === "flaky").length;
+    const failed = filteredResults.filter((r) => r.status === "failed" || r.status === "timedOut").length;
+    const successRate = ((passedTests + flakyTests) / totalTests * 100).toFixed(2);
     const templateSource = import_fs.default.readFileSync(import_path2.default.resolve(__dirname, "report-template.hbs"), "utf-8");
     const template = import_handlebars.default.compile(templateSource);
     const data = {
-      totalDuration: this.results[0].totalDuration,
+      totalDuration,
       suiteName: this.suiteName,
       results: this.results,
-      passCount: this.results.filter((r) => r.status === "passed").length,
-      failCount: this.results.filter((r) => r.status === "failed" || r.status === "timedOut").length,
+      retryCount: this.results.filter((r) => r.isRetry).length,
+      passCount: passedTests,
+      failCount: failed,
       skipCount: this.results.filter((r) => r.status === "skipped").length,
-      flakyCount: this.results.filter((r) => r.flaky === "flaky").length,
-      totalCount: this.results.length,
+      flakyCount: flakyTests,
+      totalCount: filteredResults.length,
       groupedResults: this.groupedResults,
       projectName: this.config.projectName,
       authorName: this.config.authorName,
       testType: this.config.testType,
-      successRate: this._successRate,
-      lastRunDate: formatDate(/* @__PURE__ */ new Date())
+      preferredTheme: this.config.preferredTheme,
+      successRate,
+      lastRunDate: formatDate(/* @__PURE__ */ new Date()),
+      projects: this.projectSet
     };
     return template(data);
   }
@@ -201,4 +214,3 @@ function safeStringify(obj, indent = 2) {
   cache.clear();
   return json;
 }
-var ortoni_report_default = OrtoniReport;

package/dist/ortoni-report.mjs

@@ -11,11 +11,22 @@ function msToTime(duration) {
   const seconds = Math.floor(duration / 1e3 % 60);
   const minutes = Math.floor(duration / (1e3 * 60) % 60);
   const hours = Math.floor(duration / (1e3 * 60 * 60) % 24);
-  const hoursStr = hours < 10 ? "0" + hours : hours;
-  const minutesStr = minutes < 10 ? "0" + minutes : minutes;
-  const secondsStr = seconds < 10 ? "0" + seconds : seconds;
-  const millisecondsStr = milliseconds < 100 ? "0" + milliseconds : milliseconds;
-  return `${hoursStr}:${minutesStr}:${secondsStr}.${millisecondsStr}`;
+  let result = "";
+  if (hours > 0) {
+    result += `${hours}h:`;
+  }
+  if (minutes > 0 || hours > 0) {
+    result += `${minutes < 10 ? "0" + minutes : minutes}m:`;
+  }
+  if (seconds > 0 || minutes > 0 || hours > 0) {
+    result += `${seconds < 10 ? "0" + seconds : seconds}s`;
+  }
+  if (milliseconds > 0 && !(seconds > 0 || minutes > 0 || hours > 0)) {
+    result += `${milliseconds}ms`;
+  } else if (milliseconds > 0) {
+    result += `:${milliseconds < 100 ? "0" + milliseconds : milliseconds}ms`;
+  }
+  return result;
 }
 function normalizeFilePath(filePath) {
   const normalizedPath = path.normalize(filePath);
@@ -33,16 +44,11 @@ function formatDate(date) {
 var OrtoniReport = class {
   constructor(config = {}) {
     this.results = [];
-    this._successRate = "";
+    this.projectSet = /* @__PURE__ */ new Set();
     this.config = config;
   }
   onBegin(config, suite) {
     this.results = [];
-    const screenshotsDir = path2.resolve(process.cwd(), "screenshots");
-    if (fs.existsSync(screenshotsDir)) {
-      fs.rmSync(screenshotsDir, { recursive: true, force: true });
-    }
-    fs.mkdirSync(screenshotsDir, { recursive: true });
   }
   onTestBegin(test, result) {
   }
@@ -51,46 +57,45 @@ var OrtoniReport = class {
     if (test.outcome() === "flaky") {
       status = "flaky";
     }
+    this.projectSet.add(test.titlePath()[1]);
     const testResult = {
+      retry: result.retry > 0 ? "retry" : "",
       isRetry: result.retry,
-      totalDuration: "",
       projectName: test.titlePath()[1],
-      // Get the project name
       suite: test.titlePath()[3],
-      // Adjust the index based on your suite hierarchy
       title: test.title,
       status,
       flaky: test.outcome(),
       duration: msToTime(result.duration),
       errors: result.errors.map((e) => colors.strip(e.message || e.toString())),
       steps: result.steps.map((step) => ({
-        title: step.title,
+        titlePath: step.titlePath,
         category: step.category,
         duration: step.duration,
-        status: result.status
+        error: step.error,
+        location: step.location,
+        parent: step.parent,
+        startTime: step.startTime,
+        steps: step.steps,
+        title: step.title
       })),
       logs: colors.strip(result.stdout.concat(result.stderr).map((log) => log).join("\n")),
       screenshotPath: null,
-      filePath: normalizeFilePath(test.titlePath()[2])
+      filePath: normalizeFilePath(test.titlePath()[2]),
+      projects: this.projectSet
     };
     if (result.attachments) {
-      const screenshotsDir = path2.resolve(process.cwd(), "screenshots", test.id);
-      if (!fs.existsSync(screenshotsDir)) {
-        fs.mkdirSync(screenshotsDir, { recursive: true });
-      }
       const screenshot = result.attachments.find((attachment) => attachment.name === "screenshot");
       if (screenshot && screenshot.path) {
         const screenshotContent = fs.readFileSync(screenshot.path, "base64");
-        const screenshotFileName = path2.join("screenshots", test.id, path2.basename(screenshot.path));
-        fs.writeFileSync(path2.resolve(process.cwd(), screenshotFileName), screenshotContent, "base64");
-        testResult.screenshotPath = screenshotFileName;
+        testResult.screenshotPath = screenshotContent;
       }
     }
     this.results.push(testResult);
   }
   onEnd(result) {
-    this._successRate = (this.results.filter((r) => r.status === "passed").length / this.results.length * 100).toFixed(2);
-    this.results[0].totalDuration = msToTime(result.duration);
+    const filteredResults = this.results.filter((r) => r.status !== "skipped" && !r.isRetry);
+    const totalDuration = msToTime(result.duration);
     this.groupedResults = this.results.reduce((acc, result2, index) => {
       const filePath = result2.filePath;
       const suiteName = result2.suite;
@@ -126,29 +131,37 @@ var OrtoniReport = class {
     Handlebars.registerHelper("gt", function(a, b) {
       return a > b;
     });
-    const html = this.generateHTML();
+    const html = this.generateHTML(filteredResults, totalDuration);
     const outputPath = path2.resolve(process.cwd(), "ortoni-report.html");
     fs.writeFileSync(outputPath, html);
     console.log(`Ortoni HTML report generated at ${outputPath}`);
   }
-  generateHTML() {
+  generateHTML(filteredResults, totalDuration) {
+    const totalTests = filteredResults.length;
+    const passedTests = this.results.filter((r) => r.status === "passed").length;
+    const flakyTests = this.results.filter((r) => r.flaky === "flaky").length;
+    const failed = filteredResults.filter((r) => r.status === "failed" || r.status === "timedOut").length;
+    const successRate = ((passedTests + flakyTests) / totalTests * 100).toFixed(2);
     const templateSource = fs.readFileSync(path2.resolve(__dirname, "report-template.hbs"), "utf-8");
     const template = Handlebars.compile(templateSource);
     const data = {
-      totalDuration: this.results[0].totalDuration,
+      totalDuration,
       suiteName: this.suiteName,
       results: this.results,
-      passCount: this.results.filter((r) => r.status === "passed").length,
-      failCount: this.results.filter((r) => r.status === "failed" || r.status === "timedOut").length,
+      retryCount: this.results.filter((r) => r.isRetry).length,
+      passCount: passedTests,
+      failCount: failed,
       skipCount: this.results.filter((r) => r.status === "skipped").length,
-      flakyCount: this.results.filter((r) => r.flaky === "flaky").length,
-      totalCount: this.results.length,
+      flakyCount: flakyTests,
+      totalCount: filteredResults.length,
       groupedResults: this.groupedResults,
       projectName: this.config.projectName,
       authorName: this.config.authorName,
       testType: this.config.testType,
-      successRate: this._successRate,
-      lastRunDate: formatDate(/* @__PURE__ */ new Date())
+      preferredTheme: this.config.preferredTheme,
+      successRate,
+      lastRunDate: formatDate(/* @__PURE__ */ new Date()),
+      projects: this.projectSet
     };
     return template(data);
   }
@@ -167,7 +180,6 @@ function safeStringify(obj, indent = 2) {
   cache.clear();
   return json;
 }
-var ortoni_report_default = OrtoniReport;
 export {
-  ortoni_report_default as default
+  OrtoniReport as default
 };