add listenered to connection only when testRun is started

DevExpress · Sep 7, 2018 · a7a45c9 · a7a45c9
1 parent 39e7cf7
commit a7a45c9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/browser/connection/index.js b/src/browser/connection/index.js
@@ -27,6 +27,7 @@ export default class BrowserConnection extends EventEmitter {
         this.initScriptsQueue         = [];
         this.browserConnectionGateway = gateway;
         this.errorSupressed           = false;
+        this.testRunAborted           = false;
 
         this.browserInfo                           = browserInfo;
         this.browserInfo.userAgent                 = '';
@@ -121,7 +122,7 @@ export default class BrowserConnection extends EventEmitter {
 
             this.opened         = false;
             this.errorSupressed = false;
-            this.cancelTestRun  = true;
+            this.testRunAborted = true;
 
             this.emit('disconnected', err);
 
@@ -301,9 +302,9 @@ export default class BrowserConnection extends EventEmitter {
         }
 
         if (this.opened) {
-            const testRunUrl = await this._getTestRunUrl(isTestDone || this.cancelTestRun);
+            const testRunUrl = await this._getTestRunUrl(isTestDone || this.testRunAborted);
 
-            this.cancelTestRun = false;
+            this.testRunAborted = false;
 
             if (testRunUrl) {
                 this.idle = false;

diff --git a/src/test-run/index.js b/src/test-run/index.js
@@ -121,8 +121,6 @@ export default class TestRun extends EventEmitter {
         this.requestHooks = Array.from(this.test.requestHooks);
 
         this._initRequestHooks();
-
-        this.browserConnection.once('disconnected', err => this.disconnect(err));
     }
 
     get id () {
@@ -277,6 +275,10 @@ export default class TestRun extends EventEmitter {
 
         this.emit('start');
 
+        const onDisconnected = err => this._disconnect(err);
+
+        this.browserConnection.once('disconnected', onDisconnected);
+
         if (await this._runBeforeHook()) {
             await this._executeTestFn(PHASE.inTest, this.test.fn);
             await this._runAfterHook();
@@ -285,6 +287,8 @@ export default class TestRun extends EventEmitter {
         if (this.disconnected)
             return;
 
+        this.browserConnection.removeListener('disconnected', onDisconnected);
+
         if (this.errs.length && this.debugOnFail)
             await this._enqueueSetBreakpointCommand(null, this.debugReporterPluginHost.formatError(this.errs[0]));
 
@@ -381,7 +385,7 @@ export default class TestRun extends EventEmitter {
     }
 
     _rejectCurrentDriverTask (err) {
-        err.callsite             = err.callsite || this.driverTaskQueue[0].callsite;
+        err.callsite             = err.callsite || this.currentDriverTask.callsite;
         err.isRejectedDriverTask = true;
 
         this.currentDriverTask.reject(err);
@@ -677,7 +681,7 @@ export default class TestRun extends EventEmitter {
         return await getLocation();
     }
 
-    disconnect (err) {
+    _disconnect (err) {
         this.disconnected = true;
 
         this._rejectCurrentDriverTask(err);