fixed traceViewerUrl for merging reports

cenfun · Mar 13, 2024 · ed00478 · ed00478
1 parent 8af84ee
commit ed00478
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+* 2.4.3
+  - fixed `traceViewerUrl` for merging reports
+
 * 2.4.2
   - fixed tag issue for both title and new syntax
 

diff --git a/lib/generate-data.js b/lib/generate-data.js
@@ -78,7 +78,6 @@ const generateData = async (results) => {
     data.suiteTypes = ['project', 'file', 'describe', 'shard'];
     data.caseTypes = ['passed', 'flaky', 'skipped', 'failed'];
     data.traceViewerUrl = options.traceViewerUrl;
-
     data.mermaid = options.mermaid;
 
     calculateSummary(data, options);

diff --git a/lib/merge-data.js b/lib/merge-data.js
@@ -124,6 +124,13 @@ const mergeDataList = async (dataList, options) => {
         ... dataList.shift()
     };
 
+    // merge new options
+    ['traceViewerUrl', 'mermaid'].forEach((k) => {
+        if (Util.hasOwn(options, k)) {
+            mergedData[k] = options[k];
+        }
+    });
+
     const reportName = options.name || mergedData.name;
 
     const date = Math.min.apply(null, dates);