suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #991 from adomasven/fix/feed-import-test

Browse Source 
Fixes feed-import (and possibly other feed) test unhandled rejections
This commit is contained in:
Dan Stillman 2016-05-05 06:08:33 -04:00
commit b7ad582d99
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
chrome/content/zotero/xpcom/feedReader.js
View File

@ -186,7 +186,14 @@ Zotero.FeedReader.prototype.terminate = function(status) {
// Reject feed item promise if not resolved yet // Reject feed item promise if not resolved yet
let lastItem = this._feedItems[this._feedItems.length - 1]; let lastItem = this._feedItems[this._feedItems.length - 1];
if (lastItem.promise.isPending()) { 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 // Close feed connection