Merge pull request #112 from forcedotcom/develop

merge to develop master
forcedotcom · Mar 19, 2019 · 46815bf · 46815bf
2 parents 8a6fc47 + 1969592
commit 46815bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/sfdxError.ts b/src/sfdxError.ts
@@ -199,7 +199,10 @@ export class SfdxError extends NamedError {
    * Convert an Error to an SfdxError.
    * @param err The error to convert.
    */
-  public static wrap(err: Error): SfdxError {
+  public static wrap(err: Error | string): SfdxError {
+    if (isString(err)) {
+      return new SfdxError(err);
+    }
     const sfdxError = new SfdxError(err.message, err.name);
     if (sfdxError.stack) {
       sfdxError.stack = sfdxError.stack.replace(`${err.name}: ${err.message}`, 'Outer stack:');

diff --git a/test/unit/sfdxErrorTest.ts b/test/unit/sfdxErrorTest.ts
@@ -115,6 +115,12 @@ describe('SfdxError', () => {
       expect(mySfdxError).to.be.an.instanceOf(SfdxError);
       expect(mySfdxError.code).to.equal(myErrorCode);
     });
+
+    it('should return a new error with just a string', () => {
+      const mySfdxError = SfdxError.wrap('test');
+      expect(mySfdxError).to.be.an.instanceOf(SfdxError);
+      expect(mySfdxError.message).to.equal('test');
+    });
   });
 
   describe('toObject', () => {