Use correct error name in message and stack

kommander · May 24, 2017 · cc11128 · cc11128
1 parent f4beecc
commit cc11128
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/lib/core.js b/lib/core.js
@@ -160,10 +160,12 @@ Broken.prototype._generateMessage = function _generateMessage() {
   // TODO: Move to extensions
   const info = this._infoStr;
 
-  let build = [subject, ' could not ', verb, ' ', object_];
+  let build = [this.name, ': ', subject, ' could not ', verb, ' ', object_];
   if (reason) {
     if (reason instanceof Broken) {
-      build = build.concat(', because ', reason.message);
+      build = build.concat(
+        ', because ', reason.message.replace(`${reason.name}: `, '')
+      );
     } else {
       // TODO: Move to reason getter or setter
       const text = reason.message || reason.code || reason.toString();
@@ -331,7 +333,7 @@ Broken.prototype.__defineGetter__('data', function dataGetter() {
  * @api public
  */
 Broken.prototype.toString = function toString() {
-  return [this.name, ': ', this.message].join('');
+  return this.message;
 };
 
 //

diff --git a/test/core.spec.js b/test/core.spec.js
@@ -242,7 +242,7 @@ describe('Core', () => {
     const err = cannot('fly', 'away');
     err.subject = 'Alice';
     expect(err.subject).to.be('Alice');
-    expect(err.message).to.be('Alice could not fly away. (No reason)');
+    expect(err.message).to.be('Error: Alice could not fly away. (No reason)');
   });
 
   //
@@ -472,7 +472,7 @@ describe('Core', () => {
       expect(err).to.have.property('_infoStr');
       expect(err._infoStr).to.be.a('string');
       expect(err._infoStr).to.be('additional stuff');
-      expect(err.message).to.be('I could not fly into the sky. (No reason) (additional stuff)');
+      expect(err.message).to.be('Error: I could not fly into the sky. (No reason) (additional stuff)');
     });
 
     it('allows to concat info with rest arguments');
@@ -491,7 +491,7 @@ describe('Core', () => {
       expect(err._infoStr).to.be.a('string');
       expect(err._infoStr).to.be('additional stuff');
       // eslint-disable-next-line
-      expect(err.message).to.be('I could not fly into the sky, because I could not overcome gravity. (No reason) (additional stuff)');
+      expect(err.message).to.be('Error: I could not fly into the sky, because I could not overcome gravity. (No reason) (additional stuff)');
     });
 
     //
@@ -503,7 +503,7 @@ describe('Core', () => {
       expect(err._infoStr).to.be.a('string');
       expect(err._infoStr).to.be('additional stuff');
       // eslint-disable-next-line
-      expect(err.message).to.be('I could not fly into the sky. (No reason) (additional stuff)');
+      expect(err.message).to.be('Error: I could not fly into the sky. (No reason) (additional stuff)');
     });
 
     //
@@ -516,7 +516,7 @@ describe('Core', () => {
       expect(err._infoStr).to.be.a('string');
       expect(err._infoStr).to.be('additional stuff');
       // eslint-disable-next-line
-      expect(err.message).to.be('I could not fly into the sky, because I could not overcome gravity, because I need rocket fuel. (additional stuff)');
+      expect(err.message).to.be('Error: I could not fly into the sky, because I could not overcome gravity, because I need rocket fuel. (additional stuff)');
     });
   });
 });