Fix: Ensure we are displaying a valid error string (#414)

box · Oct 5, 2017 · ec908ba · ec908ba
1 parent 9a7882c
commit ec908ba
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/lib/viewers/error/PreviewErrorViewer.js b/src/lib/viewers/error/PreviewErrorViewer.js
@@ -81,7 +81,8 @@ class PreviewErrorViewer extends BaseViewer {
         /* eslint-enable no-param-reassign */
 
         // If there is no display message fallback to the message from above
-        const displayMessage = err.displayMessage || err.message;
+        let displayMessage = err.displayMessage || err.message;
+        displayMessage = typeof displayMessage === 'string' ? displayMessage : __('error_default');
 
         this.iconEl.innerHTML = icon;
         this.messageEl.textContent = displayMessage;

diff --git a/src/lib/viewers/error/__tests__/PreviewErrorViewer-test.js b/src/lib/viewers/error/__tests__/PreviewErrorViewer-test.js
@@ -104,6 +104,17 @@ describe('lib/viewers/error/PreviewErrorViewer', () => {
             expect(error.addDownloadButton).to.not.be.called;
         });
 
+        it('set the display message to the fallback error if the original display message is not a string', () => {
+            const err = new Error();
+            err.displayMessage = {
+                error: 'error!'
+            };
+
+            error.load(err);
+
+            expect(error.messageEl.textContent).to.equal(__('error_default'));
+        });
+
         it('should not add download button if the browser cannot download', () => {
             sandbox.stub(error, 'addDownloadButton');
             sandbox.stub(Browser, 'canDownload').returns(false);