feat(eyes-selenium): close batches on getAllTestResults

astappiev · Sep 17, 2019 · 94c3ffb · 94c3ffb
1 parent af38cfe
commit 94c3ffb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/packages/eyes-selenium/lib/runner/ClassicRunner.js b/packages/eyes-selenium/lib/runner/ClassicRunner.js
@@ -21,6 +21,8 @@ class ClassicRunner extends EyesRunner {
  for (const testResults of this._allTestResult) {
  allResults.push(new TestResultContainer(testResults));
  }
+
+ await this._closeAllBatches();
  return new TestResultsSummary(allResults);
  }
 }

diff --git a/packages/eyes-selenium/lib/runner/EyesRunner.js b/packages/eyes-selenium/lib/runner/EyesRunner.js
@@ -15,6 +15,25 @@ class EyesRunner {
  async getAllTestResults(shouldThrowException) { // eslint-disable-line no-unused-vars
  throw new TypeError('The method is not implemented!');
  }
+
+ /**
+ * @protected
+ * @return {Promise<void>}
+ */
+ async _closeAllBatches() {
+ if (this._eyesInstances.length > 0) {
+ const batchIds = new Set();
+ for (const eyesInstance of this._eyesInstances) {
+ const batchId = eyesInstance.getBatch().getId();
+ if (!batchIds.has(batchId)) {
+ batchIds.add(batchId);
+ }
+ }
+
+ const promises = Array.from(batchIds).map(batchId => this._eyesInstances[0]._serverConnector.deleteBatchSessions(batchId));
+ await Promise.all(promises);
+ }
+ }
 }
 
 exports.EyesRunner = EyesRunner;
diff --git a/packages/eyes-selenium/lib/runner/VisualGridRunner.js b/packages/eyes-selenium/lib/runner/VisualGridRunner.js
@@ -25,11 +25,7 @@ class VisualGridRunner extends EyesRunner {
  * @return {Promise<TestResultsSummary>}
  */
  async getAllTestResults(shouldThrowException = true) {
- if (this._eyesInstances.length === 1) {
- return this._eyesInstances[0].closeAndReturnResults(shouldThrowException);
- }
-
- if (this._eyesInstances.length > 1) {
+ if (this._eyesInstances.length > 0) {
  const resultsPromise = [];
  const allResults = [];
 
@@ -50,6 +46,7 @@ class VisualGridRunner extends EyesRunner {
  }
  }
 
+ await this._closeAllBatches();
  return new TestResultsSummary(allResults);
  }