Build unexpected.js

unexpectedjs · Mar 13, 2016 · 342f9e4 · 342f9e4
1 parent 6f454d4
commit 342f9e4
Showing 1 changed file with 10 additions and 18 deletions.
diff --git a/unexpected.js b/unexpected.js
@@ -243,26 +243,19 @@ function createExpectIt(expect, expectations) {
         });
 
         return oathbreaker(expect.promise.settle(promises).then(function () {
-            var isSuccessful = groupEvaluations.some(function (groupEvaluation) {
-                return groupEvaluation.every(function (evaluation) {
-                    return evaluation.promise.isFulfilled();
-                });
-            }) && !groupEvaluations.some(function (groupEvaluation) {
-                // If one of the or groups has a bubbleThrough error as the
-                // first failing assertion, fail the whole expect.it:
-                for (var i = 0 ; i < groupEvaluation.length ; i += 1) {
-                    var evaluation = groupEvaluation[i];
-                    if (evaluation.promise.isRejected()) {
-                        if (evaluation.promise.reason().errorMode === 'bubbleThrough') {
-                            return true;
-                        } else {
-                            break;
-                        }
+            groupEvaluations.forEach(function (groupEvaluation) {
+                groupEvaluation.forEach(function (evaluation) {
+                    if (evaluation.promise.isRejected() && evaluation.promise.reason().errorMode === 'bubbleThrough') {
+                        throw evaluation.promise.reason();
                     }
-                }
+                });
             });
 
-            if (!isSuccessful) {
+            if (!groupEvaluations.some(function (groupEvaluation) {
+                return groupEvaluation.every(function (evaluation) {
+                    return evaluation.promise.isFulfilled();
+                });
+            })) {
                 expect.fail(function (output) {
                     writeGroupEvaluationsToOutput(expect, output, groupEvaluations);
                 });
@@ -886,7 +879,6 @@ Unexpected.prototype.throwAssertionNotFoundError = function (subject, testDescri
     var candidateHandlers = this.assertions[testDescriptionString];
     if (candidateHandlers) {
         this.fail({
-            errorMode: 'bubbleThrough',
             message: function (output) {
                 var subjectOutput = function (output) {
                     output.appendInspected(subject);