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

Fix test failures introduced after #1044

Browse Source
This commit is contained in:
Adomas Venčkauskas 2016-06-22 12:41:33 +03:00 committed by Dan Stillman
parent dd8fd2b1ac
commit 834597c8bb
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chrome/content/zotero/xpcom/data/feeds.js
View File

@ -154,6 +154,7 @@ Zotero.Feeds = new function() {
feed.name = json[feed.url][0]; feed.name = json[feed.url][0];
feed.cleanupAfter = json[feed.url][1]; feed.cleanupAfter = json[feed.url][1];
feed.refreshInterval = json[feed.url][2]; feed.refreshInterval = json[feed.url][2];
delete json[feed.url];
} else { } else {
Zotero.debug("Feed " + feed.url + " does not exist in remote JSON. Deleting"); Zotero.debug("Feed " + feed.url + " does not exist in remote JSON. Deleting");
yield feed.erase(); yield feed.erase();

2
chrome/content/zotero/xpcom/syncedSettings.js
View File

@ -230,7 +230,7 @@ Zotero.SyncedSettings = (function () {
_cache[libraryID][setting] = { _cache[libraryID][setting] = {
value, value,
synced: !!synced, synced: !!synced,
version: version > 0 ? version : metadata.version version: version > 0 || !hasCurrentValue ? version : metadata.version
}; };
var conflict = metadata && !metadata.synced && metadata.version < version; var conflict = metadata && !metadata.synced && metadata.version < version;

4
test/tests/feedsTest.js
View File

@ -44,12 +44,12 @@ describe("Zotero.Feeds", function () {
}); });
describe("#restoreFromJSON", function() { describe("#restoreFromJSON", function() {
var json = {}; var json, expiredFeedURL, existingFeedURL;
var expiredFeedURL, existingFeedURL;
beforeEach(function* () { beforeEach(function* () {
yield clearFeeds(); yield clearFeeds();
json = {};
for (let i = 0; i < 2; i++) { for (let i = 0; i < 2; i++) {
let url = "http://" + Zotero.Utilities.randomString(10, 'abcdefgh') + ".com/feed.rss"; let url = "http://" + Zotero.Utilities.randomString(10, 'abcdefgh') + ".com/feed.rss";
json[url] = { json[url] = {