Fix: Display correct error when handling an asset error (#829)

box · Aug 16, 2018 · 2f70273 · 2f70273
1 parent 4fd4258
commit 2f70273
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/lib/viewers/BaseViewer.js b/src/lib/viewers/BaseViewer.js
@@ -299,7 +299,7 @@ class BaseViewer extends EventEmitter {
      */
     handleAssetError(err) {
         const originalMessage = err ? err.message : '';
-        const error = new PreviewError(ERROR_CODE.LOAD_ASSET, '', {}, originalMessage);
+        const error = err instanceof PreviewError ? err : new PreviewError(ERROR_CODE.LOAD_ASSET, originalMessage, {});
         this.triggerError(error);
         this.destroyed = true;
     }

diff --git a/src/lib/viewers/__tests__/BaseViewer-test.js b/src/lib/viewers/__tests__/BaseViewer-test.js
@@ -205,6 +205,13 @@ describe('lib/viewers/BaseViewer', () => {
             expect(base.destroyed).to.be.true;
         });
 
+        it('should use the original error if it is a PreviewError', () => {
+            sandbox.stub(base, 'triggerError');
+            const originalError = new PreviewError('foo', 'bar');
+            base.handleAssetError(originalError);
+            expect(base.triggerError).to.be.calledWith(originalError);
+        });
+
         it('should pass along the error if provided', () => {
             const stub = sandbox.stub(base, 'triggerError');