chore(empower): rebuild web bundle

power-assert-js · Sep 30, 2014 · ddebf3c · ddebf3c
1 parent 53e882e
commit ddebf3c
Showing 1 changed file with 19 additions and 15 deletions.
diff --git a/build/empower.js b/build/empower.js
@@ -116,7 +116,7 @@ function decorate (callSpec, decorator) {
         thisObj = callSpec.thisObj,
         numArgsToCapture = callSpec.numArgsToCapture;
 
-    return function () {
+    return function decoratedAssert () {
         var context, message, args = slice.apply(arguments);
 
         if (args.every(isNotCaptured)) {
@@ -235,29 +235,33 @@ Decorator.prototype.concreteAssert = function (invocation, context) {
 };
 
 Decorator.prototype.errorToRethrow = function (e, originalMessage, context) {
-    var f;
+    var f, attrs;
     if (e.name !== 'AssertionError') {
         return e;
     }
     if (typeof this.receiver.AssertionError !== 'function') {
         return e;
     }
-    if (isPhantom) {
-        f = new this.receiver.AssertionError({
-            actual: e.actual,
-            expected: e.expected,
-            operator: e.operator,
-            message: e.message
-        });
+
+    attrs = {
+        actual: e.actual,
+        expected: e.expected,
+        operator: e.operator,
+        message: e.message
+    };
+
+    if (this.config.modifyMessageOnRethrow) {
+        attrs.message = this.buildPowerAssertText(originalMessage, context);
+        attrs.stackStartFunction = Decorator.prototype.concreteAssert;
+    }
+
+    if (isPhantom || this.config.modifyMessageOnRethrow) {
+        f = new this.receiver.AssertionError(attrs);
     } else {
         f = e;
+        f.message = attrs.message;
     }
-    if (this.config.modifyMessageOnRethrow) {
-        f.message = this.buildPowerAssertText(originalMessage, context);
-        if (typeof e.generatedMessage !== 'undefined') {
-            f.generatedMessage = false;
-        }
-    }
+
     if (this.config.saveContextOnRethrow) {
         f.powerAssertContext = context;
     }