ortoni-report 1.1.3 → 1.1.5

package/dist/ortoni-report.d.ts

@@ -1,9 +1,10 @@
 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 {
@@ -20,6 +21,7 @@ interface TestResultData {
     logs: string;
     screenshotPath: string | null;
     filePath: any;
+    projects: Set<string>;
 }
 
 declare class OrtoniReport implements Reporter {
@@ -27,12 +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;
     onEnd(result: FullResult): void;
     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"));
@@ -47,16 +47,18 @@ function msToTime(duration) {
   const hours = Math.floor(duration / (1e3 * 60 * 60) % 24);
   let result = "";
   if (hours > 0) {
-    result += (hours < 10 ? "0" + hours : hours) + "h:";
+    result += `${hours}h:`;
   }
   if (minutes > 0 || hours > 0) {
-    result += (minutes < 10 ? "0" + minutes : minutes) + "m:";
+    result += `${minutes < 10 ? "0" + minutes : minutes}m:`;
   }
   if (seconds > 0 || minutes > 0 || hours > 0) {
-    result += (seconds < 10 ? "0" + seconds : seconds) + "s";
+    result += `${seconds < 10 ? "0" + seconds : seconds}s`;
   }
-  if (milliseconds > 0) {
-    result += ":" + (milliseconds < 100 ? "0" + milliseconds : milliseconds) + "ms";
+  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;
 }
@@ -76,15 +78,11 @@ function formatDate(date) {
 var OrtoniReport = class {
   constructor(config = {}) {
     this.results = [];
+    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) {
   }
@@ -93,6 +91,7 @@ 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,
@@ -116,19 +115,14 @@ var OrtoniReport = class {
       })),
       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);
@@ -198,8 +192,10 @@ var OrtoniReport = class {
       projectName: this.config.projectName,
       authorName: this.config.authorName,
       testType: this.config.testType,
+      preferredTheme: this.config.preferredTheme,
       successRate,
-      lastRunDate: formatDate(/* @__PURE__ */ new Date())
+      lastRunDate: formatDate(/* @__PURE__ */ new Date()),
+      projects: this.projectSet
     };
     return template(data);
   }
@@ -218,4 +214,3 @@ function safeStringify(obj, indent = 2) {
   cache.clear();
   return json;
 }
-var ortoni_report_default = OrtoniReport;

package/dist/ortoni-report.mjs

@@ -13,16 +13,18 @@ function msToTime(duration) {
   const hours = Math.floor(duration / (1e3 * 60 * 60) % 24);
   let result = "";
   if (hours > 0) {
-    result += (hours < 10 ? "0" + hours : hours) + "h:";
+    result += `${hours}h:`;
   }
   if (minutes > 0 || hours > 0) {
-    result += (minutes < 10 ? "0" + minutes : minutes) + "m:";
+    result += `${minutes < 10 ? "0" + minutes : minutes}m:`;
   }
   if (seconds > 0 || minutes > 0 || hours > 0) {
-    result += (seconds < 10 ? "0" + seconds : seconds) + "s";
+    result += `${seconds < 10 ? "0" + seconds : seconds}s`;
   }
-  if (milliseconds > 0) {
-    result += ":" + (milliseconds < 100 ? "0" + milliseconds : milliseconds) + "ms";
+  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;
 }
@@ -42,15 +44,11 @@ function formatDate(date) {
 var OrtoniReport = class {
   constructor(config = {}) {
     this.results = [];
+    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) {
   }
@@ -59,6 +57,7 @@ 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,
@@ -82,19 +81,14 @@ var OrtoniReport = class {
       })),
       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);
@@ -164,8 +158,10 @@ var OrtoniReport = class {
       projectName: this.config.projectName,
       authorName: this.config.authorName,
       testType: this.config.testType,
+      preferredTheme: this.config.preferredTheme,
       successRate,
-      lastRunDate: formatDate(/* @__PURE__ */ new Date())
+      lastRunDate: formatDate(/* @__PURE__ */ new Date()),
+      projects: this.projectSet
     };
     return template(data);
   }
@@ -184,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
 };