Merge pull request #195 from reportportal/develop

Release 5.3.1
reportportal · Jun 24, 2024 · 4e97483 · 4e97483
2 parents e7d8756 + 5bb8563
commit 4e97483
Show file tree

Hide file tree

Showing 9 changed files with 1,700 additions and 1,472 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @AmsterGet @AliakseiLiasnitski
+* @AmsterGet
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### Fixed
+- [#192](https://github.com/reportportal/agent-js-cypress/issues/192). Reporter procreates an enormous amount of processes during execution. Thanks to [epam-avramenko](https://github.com/epam-avramenko).
+### Changed
+- `@reportportal/client-javascript` bumped to version `5.1.4`.
 
 ## [5.3.0] - 2024-05-07
 ### Added

diff --git a/README.md b/README.md
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.3.0
+5.3.1-SNAPSHOT
diff --git a/lib/cypressReporter.js b/lib/cypressReporter.js
@@ -160,9 +160,6 @@ class CypressReporter extends Mocha.reporters.Base {
     });
 
     this.runner.on(EVENT_RUN_END, () => {
-      if (CypressReporter.reporterOptions.launchId) {
-        return;
-      }
       CypressReporter.calcTotalLaunches();
       if (CypressReporter.shouldStopLaunch()) {
         this.worker.send({ event: EVENT_RUN_END, launch: getLaunchStartObject(config) });

diff --git a/lib/reporter.js b/lib/reporter.js
@@ -74,17 +74,20 @@ class Reporter {
   }
 
   runEnd() {
-    const finishLaunchPromise = this.client
-      .finishLaunch(
-        this.tempLaunchId,
-        Object.assign(
-          {
-            endTime: new Date().valueOf(),
-          },
-          this.launchStatus && { status: this.launchStatus },
-        ),
-      )
-      .promise.then(() => {
+    const basePromise = this.config.reporterOptions.launchId
+      ? this.client.getPromiseFinishAllItems(this.tempLaunchId)
+      : this.client.finishLaunch(
+          this.tempLaunchId,
+          Object.assign(
+            {
+              endTime: new Date().valueOf(),
+            },
+            this.launchStatus && { status: this.launchStatus },
+          ),
+        ).promise;
+
+    const finishLaunchPromise = basePromise
+      .then(() => {
         const { launch, isLaunchMergeRequired } = this.config.reporterOptions;
         if (isLaunchMergeRequired) {
           deleteMergeLaunchLockFile(launch, this.tempLaunchId);