commit b7ad582d9930a47a740a94332ab59f1b8385a3e1 parent 09c3a95a7e17f88972f1e616f6a90e4b8d2a2531 Author: Dan Stillman <dstillman@zotero.org> Date: Thu, 5 May 2016 06:08:33 -0400 Merge pull request #991 from adomasven/fix/feed-import-test Fixes feed-import (and possibly other feed) test unhandled rejections Diffstat:
| M | chrome/content/zotero/xpcom/feedReader.js | | | 9 | ++++++++- |
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/feedReader.js b/chrome/content/zotero/xpcom/feedReader.js @@ -186,7 +186,14 @@ Zotero.FeedReader.prototype.terminate = function(status) { // Reject feed item promise if not resolved yet let lastItem = this._feedItems[this._feedItems.length - 1]; if (lastItem.promise.isPending()) { - lastItem.reject(new Error(status)); + // It seemed like a good idea to reject the last item but + // it's not really been useful yet, aside from bluebird + // throwing errors about unhandled rejections in tests + // so we suppress them here. TODO: We should probably + // rethink whether this code makes sense and make it better. + let er = new Error(status); + er.handledRejection = true; + lastItem.reject(er); } // Close feed connection