@testomatio/reporter 2.8.5-beta.2-yarn → 2.8.5

package/lib/adapter/playwright.d.ts

@@ -3,6 +3,8 @@ declare class PlaywrightReporter {
     constructor(config?: {});
     client: TestomatioClient;
     uploads: any[];
+    reportTestPromises: any[];
+    runPromise: Promise<void>;
     onBegin(config: any, suite: any): void;
     suite: any;
     config: any;

package/lib/adapter/playwright.js

@@ -21,11 +21,12 @@ const playwright_js_1 = require("./utils/playwright.js");
 Object.defineProperty(exports, "fetchLinksFromLogs", { enumerable: true, get: function () { return playwright_js_1.fetchLinksFromLogs; } });
 const step_formatter_js_1 = require("./utils/step-formatter.js");
 const log_js_1 = require("../utils/log.js");
-const reportTestPromises = [];
 class PlaywrightReporter {
     constructor(config = {}) {
         this.client = new client_js_1.default({ apiKey: config?.apiKey });
         this.uploads = [];
+        this.reportTestPromises = [];
+        this.runPromise = Promise.resolve();
     }
     onBegin(config, suite) {
         // clean data storage
@@ -34,7 +35,9 @@ class PlaywrightReporter {
             return;
         this.suite = suite;
         this.config = config;
-        this.client.createRun();
+        this.uploads = [];
+        this.reportTestPromises = [];
+        this.runPromise = this.client.createRun();
     }
     onTestBegin(testInfo) {
         const fullTestTitle = getTestContextName(testInfo);
@@ -44,6 +47,7 @@ class PlaywrightReporter {
         // test.parent.project().__projectId
         if (!this.client)
             return;
+        await this.runPromise;
         const { title } = test;
         const { error, duration } = result;
         const pwAttachments = (result.attachments || []).filter(a => a.body || a.path);
@@ -126,7 +130,12 @@ class PlaywrightReporter {
                 ...meta,
                 ...project.metadata, // metadata has any type (in playwright), but we will stringify it in client.js
                 ...test.annotations?.reduce((acc, annotation) => {
-                    acc[annotation.type] = annotation.description;
+                    if (acc[annotation.type]) {
+                        acc[annotation.type] = `${acc[annotation.type]}, ${annotation.description}`;
+                    }
+                    else {
+                        acc[annotation.type] = annotation.description;
+                    }
                     return acc;
                 }, {}),
             },
@@ -140,7 +149,7 @@ class PlaywrightReporter {
         });
         // remove empty uploads
         this.uploads = this.uploads.filter(anUpload => anUpload.files.length);
-        reportTestPromises.push(reportTestPromise);
+        this.reportTestPromises.push(reportTestPromise);
     }
     #getArtifactPath(artifact) {
         if (artifact.path) {
@@ -164,7 +173,8 @@ class PlaywrightReporter {
     async onEnd(result) {
         if (!this.client)
             return;
-        await Promise.all(reportTestPromises);
+        await this.runPromise;
+        await Promise.all(this.reportTestPromises);
         if (this.uploads.length) {
             if (this.client.uploader.isEnabled)
                 log_js_1.log.info(`🎞️ Uploading ${this.uploads.length} files...`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testomatio/reporter",
-  "version": "2.8.5-beta.2-yarn",
+  "version": "2.8.5",
   "description": "Testomatio Reporter Client",
   "engines": {
     "node": ">=18"

package/src/adapter/playwright.js

@@ -14,13 +14,13 @@ import { fetchLinksFromLogs } from './utils/playwright.js';
 import { formatStep, addStatusToStep, addArtifactsToStep } from './utils/step-formatter.js';
 import { log } from '../utils/log.js';
 
-const reportTestPromises = [];
-
 class PlaywrightReporter {
   constructor(config = {}) {
     this.client = new TestomatioClient({ apiKey: config?.apiKey });
 
     this.uploads = [];
+    this.reportTestPromises = [];
+    this.runPromise = Promise.resolve();
   }
 
   onBegin(config, suite) {
@@ -29,7 +29,9 @@ class PlaywrightReporter {
     if (!this.client) return;
     this.suite = suite;
     this.config = config;
-    this.client.createRun();
+    this.uploads = [];
+    this.reportTestPromises = [];
+    this.runPromise = this.client.createRun();
   }
 
   onTestBegin(testInfo) {
@@ -41,6 +43,7 @@ class PlaywrightReporter {
     // test.parent.project().__projectId
 
     if (!this.client) return;
+    await this.runPromise;
 
     const { title } = test;
     const { error, duration } = result;
@@ -133,7 +136,11 @@ class PlaywrightReporter {
         ...meta,
         ...project.metadata, // metadata has any type (in playwright), but we will stringify it in client.js
         ...test.annotations?.reduce((acc, annotation) => {
-          acc[annotation.type] = annotation.description;
+          if (acc[annotation.type]) {
+            acc[annotation.type] = `${acc[annotation.type]}, ${annotation.description}`;
+          } else {
+            acc[annotation.type] = annotation.description;
+          }
           return acc;
         }, {}),
       },
@@ -149,7 +156,7 @@ class PlaywrightReporter {
     // remove empty uploads
     this.uploads = this.uploads.filter(anUpload => anUpload.files.length);
 
-    reportTestPromises.push(reportTestPromise);
+    this.reportTestPromises.push(reportTestPromise);
   }
 
   #getArtifactPath(artifact) {
@@ -173,7 +180,8 @@ class PlaywrightReporter {
   async onEnd(result) {
     if (!this.client) return;
 
-    await Promise.all(reportTestPromises);
+    await this.runPromise;
+    await Promise.all(this.reportTestPromises);
 
     if (this.uploads.length) {
       if (this.client.uploader.isEnabled) log.info(`🎞️ Uploading ${this.uploads.length} files...`);