refactor and fix tests

DevExpress · May 21, 2019 · 7bfc324 · 7bfc324
1 parent fa8bdd1
commit 7bfc324
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/src/browser/connection/index.js b/src/browser/connection/index.js
@@ -182,22 +182,37 @@ export default class BrowserConnection extends EventEmitter {
 
     _restartBrowserOnDisconnect (err) {
         let resolveFn = null;
+        let rejectFn  = null;
 
-        this.disconnectionPromise = new Promise(resolve => {
+        this.disconnectionPromise = new Promise((resolve, reject) => {
             resolveFn = resolve;
-        })
-            .then(disconnectionThresholdExceedeed => {
-                if (disconnectionThresholdExceedeed)
-                    this.emit('error', err);
 
+            rejectFn = () => {
+                reject(err);
+            };
+
+            setTimeout(() => {
+                rejectFn();
+            });
+        })
+            .then(() => {
                 return this._restartBrowser();
+            })
+            .catch(e => {
+                this.emit('error', e);
             });
 
         this.disconnectionPromise.resolve = resolveFn;
+        this.disconnectionPromise.reject  = rejectFn;
     }
 
     async processDisconnection (disconnectionThresholdExceedeed) {
-        this.disconnectionPromise.resolve(disconnectionThresholdExceedeed);
+        const { resolve, reject } = this.disconnectionPromise;
+
+        if (disconnectionThresholdExceedeed)
+            reject();
+        else
+            resolve();
     }
 
     addWarning (...args) {

diff --git a/src/runner/test-run-controller.js b/src/runner/test-run-controller.js
@@ -168,15 +168,16 @@ export default class TestRunController extends AsyncEventEmitter {
             await this.emit('test-run-before-done');
     }
 
-    async _testRunDisconnected (connection) {
+    _testRunDisconnected (connection) {
         this.disconnectionCount++;
 
         const disconnectionThresholdExceedeed = this.disconnectionCount >= DISCONNECT_THRESHOLD;
 
-        await connection.processDisconnection(disconnectionThresholdExceedeed);
-
-        if (!disconnectionThresholdExceedeed)
-            await this._restartTest();
+        return connection
+            .processDisconnection(disconnectionThresholdExceedeed)
+            .then(() => {
+                return this._restartTest();
+            });
     }
 
     get blocked () {