www

commit 834597c8bbd73821afad2d84e9d615c312d299f1
parent dd8fd2b1ac134e99ecfd44649fb4ec331d08e20a
Author: Adomas Venčkauskas <adomas.ven@gmail.com>
Date:   Wed, 22 Jun 2016 12:41:33 +0300

Fix test failures introduced after #1044

Diffstat:
M
chrome/content/zotero/xpcom/data/feeds.js
 | 
1
+
M
chrome/content/zotero/xpcom/syncedSettings.js
 | 
2
+-
M
test/tests/feedsTest.js
 | 
4
++--

3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/chrome/content/zotero/xpcom/data/feeds.js b/chrome/content/zotero/xpcom/data/feeds.js
@@ -154,6 +154,7 @@ Zotero.Feeds = new function() {
 				feed.name = json[feed.url][0];
 				feed.cleanupAfter = json[feed.url][1];
 				feed.refreshInterval = json[feed.url][2];
+				delete json[feed.url];
 			} else {
 				Zotero.debug("Feed " + feed.url + " does not exist in remote JSON. Deleting");
 				yield feed.erase();
diff --git a/chrome/content/zotero/xpcom/syncedSettings.js b/chrome/content/zotero/xpcom/syncedSettings.js
@@ -230,7 +230,7 @@ Zotero.SyncedSettings = (function () {
 			_cache[libraryID][setting] = {
 				value,
 				synced: !!synced,
-				version: version > 0 ? version : metadata.version
+				version: version > 0 || !hasCurrentValue ? version : metadata.version
 			};
 			
 			var conflict = metadata && !metadata.synced && metadata.version < version;
diff --git a/test/tests/feedsTest.js b/test/tests/feedsTest.js
@@ -44,12 +44,12 @@ describe("Zotero.Feeds", function () {
 	});
 	
 	describe("#restoreFromJSON", function() {
-		var json = {};
-		var expiredFeedURL, existingFeedURL;
+		var json, expiredFeedURL, existingFeedURL;
 		
 		beforeEach(function* () {
 			yield clearFeeds();
 		
+			json = {};
 			for (let i = 0; i < 2; i++) {
 				let url = "http://" + Zotero.Utilities.randomString(10, 'abcdefgh') + ".com/feed.rss";
 				json[url] = {