refactor(empower): always re-instantiate AssertionError on rethrow

power-assert-js · Oct 1, 2014 · 997da24 · 997da24
1 parent ddebf3c
commit 997da24
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/build/empower.js b/build/empower.js
@@ -172,8 +172,7 @@ module.exports = decorate;
 var escallmatch = _dereq_('escallmatch'),
     extend = _dereq_('xtend/mutable'),
     capturable = _dereq_('./capturable'),
-    decorate = _dereq_('./decorate'),
-    isPhantom = typeof window !== 'undefined' && typeof window.callPhantom === 'function';
+    decorate = _dereq_('./decorate');
 
 
 function Decorator (receiver, formatter, config) {
@@ -247,24 +246,20 @@ Decorator.prototype.errorToRethrow = function (e, originalMessage, context) {
         actual: e.actual,
         expected: e.expected,
         operator: e.operator,
-        message: e.message
+        message: e.message,
+        stackStartFunction: Decorator.prototype.concreteAssert
     };
 
     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;
-    }
+    f = new this.receiver.AssertionError(attrs);
 
     if (this.config.saveContextOnRethrow) {
         f.powerAssertContext = context;
     }
+
     return f;
 };
 

diff --git a/lib/decorator.js b/lib/decorator.js
@@ -3,8 +3,7 @@
 var escallmatch = require('escallmatch'),
     extend = require('xtend/mutable'),
     capturable = require('./capturable'),
-    decorate = require('./decorate'),
-    isPhantom = typeof window !== 'undefined' && typeof window.callPhantom === 'function';
+    decorate = require('./decorate');
 
 
 function Decorator (receiver, formatter, config) {
@@ -78,24 +77,20 @@ Decorator.prototype.errorToRethrow = function (e, originalMessage, context) {
         actual: e.actual,
         expected: e.expected,
         operator: e.operator,
-        message: e.message
+        message: e.message,
+        stackStartFunction: Decorator.prototype.concreteAssert
     };
 
     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;
-    }
+    f = new this.receiver.AssertionError(attrs);
 
     if (this.config.saveContextOnRethrow) {
         f.powerAssertContext = context;
     }
+
     return f;
 };