Merge pull request #105 from martinhoefling/browsercrash

fix for browser crash when jsonapi not configured, closes #104
gopasspw · Jan 6, 2019 · f41816e · f41816e
2 parents d9413b1 + 398582e
commit f41816e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/tests/unit/popup.test.js b/tests/unit/popup.test.js
@@ -104,14 +104,18 @@ describe('popup', () => {
 
     describe('logAndDisplayError', () => {
         test('displays message', () => {
-            popup.logAndDisplayError({ message: 'sample error messsage' });
+            expect(() => {
+                popup.logAndDisplayError({ message: 'sample error messsage' });
+            }).toThrow({ message: 'sample error messsage' });
             expect(document.getElementsByClassName('status-text')[0].innerHTML).toBe('sample error messsage');
         });
 
         test('switches back to search', () => {
-            expect.assertions(3);
+            expect.assertions(4);
             return popup.switchToCreateNewDialog().then(() => {
-                popup.logAndDisplayError({ message: 'sample error messsage' });
+                expect(() => {
+                    popup.logAndDisplayError({ message: 'sample error messsage' });
+                }).toThrow({ message: 'sample error messsage' });
                 expect(document.getElementsByClassName('search')[0].style.display).toBe('block');
                 expect(document.getElementsByClassName('results')[0].style.display).toBe('block');
                 expect(document.getElementsByClassName('create')[0].style.display).toBe('none');

diff --git a/web-extension/popup.js b/web-extension/popup.js
@@ -70,6 +70,7 @@ function logAndDisplayError(error) {
     console.log(error);
     switchToSearch();
     setStatusText(error.message);
+    throw error;
 }
 
 function copyToClipboard(text) {