monocart-reporter 2.9.17 → 2.9.19

package/lib/default/options.js

@@ -25,9 +25,12 @@ module.exports = () => ({
     // custom trace viewer url
     traceViewerUrl: 'https://trace.playwright.dev/?trace={traceUrl}',
 
-    // timezone offset in minutes, GMT+0800 = -480
+    // timezone offset in minutes, For example: GMT+0800 = -480
     timezoneOffset: 0,
 
+    // For example: en-US, zh-CN
+    locale: null,
+
     // normal or exclude-idle
     durationStrategy: null,
 

package/lib/generate-data.js

@@ -27,12 +27,6 @@ const artifactsHandler = async (visitor, reporterOptions) => {
     return artifacts;
 };
 
-const getReportDate = (timestampStart, timezoneOffset = 0) => {
-    // in minutes
-    const offset = Util.toNum(timezoneOffset);
-    return timestampStart + offset * 60 * 1000;
-};
-
 const generateMermaid = (options) => {
     const mermaidOptions = options.mermaid;
     if (mermaidOptions) {
@@ -128,16 +122,21 @@ const generateData = async (results) => {
     system.outputFile = Util.relativePath(outputFile);
     system.outputDir = Util.relativePath(outputDir);
 
+    const timezone = new Date().getTimezoneOffset() / 60;
+    const timezoneOffset = options.timezoneOffset;
+    const locale = options.locale;
+
     // add one last tick before end time
-    const tickInfo = await getTickInfo();
+    const timestamp = Util.addTimezoneOffset(Date.now(), timezoneOffset);
+    const tickInfo = await getTickInfo(timestamp);
     system.ticks.push(tickInfo);
 
     // let start timestamp as date
-    const date = getReportDate(system.timestampStart, options.timezoneOffset);
-    const dateH = new Date(date).toLocaleString();
+    const date = system.timestampStart;
+    const dateH = Util.dateFormat(date, locale);
 
     // end timestamp for duration
-    system.timestampEnd = Date.now();
+    system.timestampEnd = timestamp;
     const duration = system.timestampEnd - system.timestampStart;
     const durationH = Util.TF(duration);
 
@@ -151,6 +150,10 @@ const generateData = async (results) => {
         duration,
         durationH,
 
+        timezone,
+        timezoneOffset,
+        locale,
+
         // for current process, like merge process
         cwd,
         outputFile,

package/lib/generate-report.js

@@ -210,7 +210,7 @@ const showTestResults = (reportData) => {
         value: `v${system.playwright}`
     }, {
         name: 'Date',
-        value: new Date(reportData.date).toLocaleString()
+        value: Util.dateFormat(reportData.date, reportData.locale)
     }, {
         name: 'Duration',
         value: Util.TF(reportData.duration)

package/lib/index.d.ts

@@ -93,6 +93,9 @@ export type MonocartReporterOptions = {
     /** timezone offset in minutes, For example: GMT+0800 = -480 */
     timezoneOffset?: number;
 
+    /** For example: en-US, zh-CN */
+    locale?: string;
+
     /** normal or exclude-idle */
     durationStrategy?: 'normal' | 'exclude-idle',
 

package/lib/index.js

@@ -45,12 +45,14 @@ class MonocartReporter {
             ... userOptions
         };
 
+        this.options.timezoneOffset = Util.toNum(this.options.timezoneOffset);
+
         Util.initLoggingLevel(this.options.logging, 'reporter');
 
         this.testMap = new Map();
 
         this.system = getSystemInfo();
-        this.system.timestampStart = timestampStart;
+        this.system.timestampStart = Util.addTimezoneOffset(timestampStart, this.options.timezoneOffset);
         this.system.ticks = [];
 
         this.tickTime = this.options.tickTime || 1000;
@@ -142,7 +144,8 @@ class MonocartReporter {
 
     tickStart() {
         this.tick_time_id = setTimeout(async () => {
-            const tickInfo = await getTickInfo();
+            const timestamp = Util.addTimezoneOffset(Date.now(), this.options.timezoneOffset);
+            const tickInfo = await getTickInfo(timestamp);
             this.system.ticks.push(tickInfo);
             this.tickStart();
         }, this.tickTime);
@@ -203,7 +206,7 @@ class MonocartReporter {
         if (!test.timestamps) {
             test.timestamps = [];
         }
-        test.timestamps.push(Date.now());
+        test.timestamps.push(Util.addTimezoneOffset(Date.now(), this.options.timezoneOffset));
 
         // keep logs here with order
         // result stderr and stdout without order
@@ -247,7 +250,7 @@ class MonocartReporter {
         }
 
         // timestamps
-        test.timestamps.push(Date.now());
+        test.timestamps.push(Util.addTimezoneOffset(Date.now(), this.options.timezoneOffset));
 
     }
 

package/lib/merge-data.js

@@ -326,7 +326,7 @@ const mergeDataList = async (dataList, options) => {
     };
 
     // merge new options
-    ['traceViewerUrl', 'mermaid'].forEach((k) => {
+    ['traceViewerUrl', 'mermaid', 'timezoneOffset', 'locale'].forEach((k) => {
         if (Util.hasOwn(options, k)) {
             mergedData[k] = options[k];
         }
@@ -336,7 +336,7 @@ const mergeDataList = async (dataList, options) => {
     const reportLogo = options.logo || mergedData.logo;
 
     const date = Math.min.apply(null, startDates);
-    const dateH = new Date(date).toLocaleString();
+    const dateH = Util.dateFormat(date, mergedData.locale);
 
     const duration = Util.getDuration(dateRanges, options.durationStrategy);
     const durationH = Util.TF(duration);