fix(jasminewd): Use promise.all to combine promises and done

- Make the flow promise explicit and use promise.all to wait for both
  promises to be fulfilled before calling the done callback

Author: sgronblo

jasminewd/index.js

@@ -90,16 +90,19 @@ function wrapInControlFlow(globalFn, fnName) {
           throw Error('Invalid # arguments (' + fn.length + ') within function "' + fnName +'"');
         }
 
-        flow.execute(function() {
+        var flowFinished = flow.execute(function() {
           fn.call(jasmine.getEnv().currentSpec, function(userError) {
             if (userError) {
               asyncFnDone.reject(new Error(userError));
             } else {
               asyncFnDone.fulfill();
             }
           });
-          return asyncFnDone.promise;
-        }, desc_).then(seal(done), function(e) {
+        }, desc_);
+
+        webdriver.promise.all([asyncFnDone, flowFinished]).then(function() {
+          seal(done)();
+        }, function(e) {
           e.stack = e.stack + '==== async task ====\n' + driverError.stack;
           done(e);
         });