fix: correctly reset running state

handle errors from openConnection too
w33ble · Apr 4, 2018 · 2f0829c · 2f0829c
1 parent 6f2a2a0
commit 2f0829c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/index.mjs b/src/index.mjs
@@ -34,7 +34,6 @@ export default class HorseySauce extends events.EventEmitter {
 
         return getBrowser(this.sauceUser, this.sauceKey, capabilities, this.tunnelId).then(
           browser => {
-            this.isRunning = false;
             this.emit('browser-ready');
 
             // do things in the browser
@@ -43,6 +42,7 @@ export default class HorseySauce extends events.EventEmitter {
                 new Promise((resolve, reject) => {
                   this.emit('runner-start');
                   runner(browser, (err, data) => {
+                    this.isRunning = false;
                     closeConnection().then(() => {
                       if (err) {
                         this.emit('runner-error', err);
@@ -53,7 +53,12 @@ export default class HorseySauce extends events.EventEmitter {
                       }
                     });
                   });
-                })
+                }),
+              err => {
+                this.isRunning = false;
+                this.emit('connection-error', err);
+                throw err;
+              }
             );
           },
           err => {
@@ -64,6 +69,7 @@ export default class HorseySauce extends events.EventEmitter {
         );
       },
       err => {
+        this.isRunning = false;
         this.emit('tunnel-error', err);
         throw err;
       }

diff --git a/src/open_connection.mjs b/src/open_connection.mjs
@@ -36,6 +36,7 @@ export default function openConnection(src, browser, options = {}) {
     .then(port => initRemote(port, browser))
     .then(
       () =>
+        // return a method to clean up connections
         function closeConnection() {
           return new Promise(resolve => {
             server.close(() => browser.quit(() => resolve()));