HACK: Fix race

papandreou · Nov 12, 2018 · dae26d0 · dae26d0
1 parent b922684
commit dae26d0
Showing 1 changed file with 38 additions and 26 deletions.
diff --git a/lib/httpception.js b/lib/httpception.js
@@ -5,6 +5,7 @@ var resolveFromAfterEach;
 var mocker;
 var promise;
 var mockDefinitionForTheCurrentTest;
+var promiseLessModeAborted;
 
 var afterEachRegistered = false;
 function ensureAfterEachIsRegistered() {
@@ -73,25 +74,35 @@ module.exports = function httpception(mockDefinition, promiseFactory) {
     });
 
   if (promiseFactory) {
-    resolveFromAfterEach = false;
+    promiseLessModeAborted = true;
+    if (resolveFromAfterEach) {
+      resolveFromAfterEach();
+    }
 
-    return mocker
-      .mock(promiseFactory)
-      .then(function() {
-        return expect(
-          promiseFactory,
-          'to perform HTTP traffic',
-          mocker.requestDescriptions
-        );
-      })
-      .then(function() {
-        mocker = undefined;
+    return expect
+      .promise((resolve, reject) => {
+        setTimeout(resolve, 5);
       })
-      .catch(function(e) {
-        mocker = undefined;
-        throw e;
+      .then(() => {
+        return mocker
+          .mock(promiseFactory)
+          .then(function() {
+            return expect(
+              promiseFactory,
+              'to perform HTTP traffic',
+              mocker.requestDescriptions
+            );
+          })
+          .then(function() {
+            mocker = undefined;
+          })
+          .catch(function(e) {
+            mocker = undefined;
+            throw e;
+          });
       });
   } else if (!promise) {
+    promiseLessModeAborted = false;
     var resolvePromise = expect.promise(function(resolve, reject) {
       resolveFromAfterEach = resolve;
     });
@@ -102,21 +113,22 @@ module.exports = function httpception(mockDefinition, promiseFactory) {
       });
     });
 
-    promise = Promise.all([resolvePromise, mockerPromise])
-      .then(result => {
+    promise = Promise.all([resolvePromise, mockerPromise]).then(result => {
+      if (!promiseLessModeAborted) {
         return expect(
           function afterEach() {},
           'to perform HTTP traffic',
           mocker.requestDescriptions
-        );
-      })
-      .then(function() {
-        mocker = undefined;
-      })
-      .catch(function(e) {
-        mocker = undefined;
-        throw e;
-      });
+        )
+          .then(function() {
+            mocker = undefined;
+          })
+          .catch(function(e) {
+            mocker = undefined;
+            throw e;
+          });
+      }
+    });
   }
 };