Add support for asynchronous tests with pending state

lib/postman-sandbox-fleet.js

@@ -159,13 +159,24 @@ class PostmanSandboxFleet {
     /**
      * Dispose off all initialized sandbox instances from the fleet
      *
+     * @param {Function} [callback] -
      * @returns {void}
      */
-    disposeAll () {
+    disposeAll (callback) {
+        let disposedCount = 0;
+
+        if (typeof callback !== 'function') {
+            callback = _.noop;
+        }
+
         this.fleet.forEach((context, templateName) => {
-            context.dispose();
+            context.dispose(() => {
+                this.fleet.delete(templateName);
 
-            this.fleet.delete(templateName);
+                if (++disposedCount === this.fleet.size) {
+                    return callback();
+                }
+            });
         });
     }
 }

lib/postman-sandbox.js

@@ -6,6 +6,8 @@ const _ = require('lodash'),
 
     TO_WAIT_BUFFER = 500, // time to wait for sandbox to declare timeout
     CONSOLE_EVENT_NAME = 'execution.console',
+    ASSERTION_EVENT_NAME = 'execution.assertion',
+    ERROR_EVENT_NAME = 'execution.error',
     EXECUTION_TIMEOUT_ERROR_MESSAGE = 'sandbox not responding',
     BRIDGE_DISCONNECTING_ERROR_MESSAGE = 'sandbox: execution interrupted, bridge disconnecting.';
 
@@ -130,20 +132,28 @@ class PostmanSandbox extends UniversalVM {
         });
     }
 
-    dispose () {
-        _.forEach(this._executing, (irq, id) => {
-            irq && clearTimeout(irq);
+    dispose (callback) {
+        this.once('dispose', () => {
+            _.forEach(this._executing, (irq, id) => {
+                irq && clearTimeout(irq);
 
-            // send an abort event to the sandbox so that it can do cleanups
-            this.dispatch('execution.abort.' + id);
+                // send an abort event to the sandbox so that it can do cleanups
+                this.dispatch('execution.abort.' + id);
 
-            // even though sandbox could bubble the result event upon receiving abort, that would reduce
-            // stability of the system in case sandbox was unresponsive.
-            this.emit('execution.result.' + id, new Error(BRIDGE_DISCONNECTING_ERROR_MESSAGE));
+                // even though sandbox could bubble the result event upon receiving abort, that would reduce
+                // stability of the system in case sandbox was unresponsive.
+                this.emit('execution.result.' + id, new Error(BRIDGE_DISCONNECTING_ERROR_MESSAGE));
+            });
+
+            this.removeAllListeners(CONSOLE_EVENT_NAME);
+            this.removeAllListeners(ASSERTION_EVENT_NAME);
+            this.removeAllListeners(ERROR_EVENT_NAME);
+            this.disconnect();
+
+            typeof callback === 'function' && callback();
         });
 
-        this.removeAllListeners(CONSOLE_EVENT_NAME);
-        this.disconnect();
+        this.dispatch('dispose');
     }
 }
 

lib/sandbox/execute.js

@@ -34,7 +34,10 @@ module.exports = function (bridge, glob) {
     // For caching required information provided during
     // initialization which will be used during execution
     let initializationOptions = {},
-        initializeExecution;
+        initializeExecution,
+
+        // Tests state in the context of the current execution
+        testsState = {};
 
     /**
      * @param {Object} options
@@ -83,6 +86,14 @@ module.exports = function (bridge, glob) {
         });
     });
 
+    bridge.once('dispose', () => {
+        // Abort all pending assertions and cleanup the global tests state
+        Object.values(testsState).forEach((test) => { test.abort(); });
+        testsState = {};
+
+        bridge.dispatch('dispose');
+    });
+
     /**
      * @param {String} id
      * @param {Event} event
@@ -214,7 +225,7 @@ module.exports = function (bridge, glob) {
                     var eventId = timers.setEvent(callback);
 
                     bridge.dispatch(executionRequestEventName, options.cursor, id, eventId, request);
-                }, dispatchAssertions, new PostmanCookieStore(id, bridge, timers), {
+                }, testsState, dispatchAssertions, new PostmanCookieStore(id, bridge, timers), {
                     disabledAPIs: initializationOptions.disabledAPIs
                 })
             ),