Added support for async before/it/after functions that return promises

2017-05-10 10:29:31 -07:00
parent 88763012e4
commit a237ac5386
2 changed files with 84 additions and 1 deletions
--- a/src/core/QueueRunner.js
+++ b/src/core/QueueRunner.js
@@ -87,7 +87,12 @@ getJasmineRequireObj().QueueRunner = function(j$) {

      try {
        if (queueableFn.fn.length === 0) {
-          queueableFn.fn.call(self.userContext);
+          var maybeThenable = queueableFn.fn.call(self.userContext);
+
+          if (maybeThenable && j$.isFunction_(maybeThenable.then)) {
+            maybeThenable.then(next, next.fail);
+            return false;
+          }
        } else {
          queueableFn.fn.call(self.userContext, next);
          return false;