mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Remove .noteSchemaVersion

Browse source 
This leaves item.note in place, rather than reverting all the
`getNote()` → `.note` changes. We can consider which we want to keep.
This commit is contained in:
Dan Stillman 2020-09-12 16:09:49 -04:00
parent 602e4c1e1f
commit 199619f40e
10 changed files with 60 additions and 199 deletions
Download patch file Download diff file Expand all files Collapse all files

23
test/tests/syncLocalTest.js
View file

@ -2560,29 +2560,6 @@ describe("Zotero.Sync.Data.Local", function() {
assert.lengthOf(result.conflicts, 1);
});
it("should ignore noteSchemaVersion=0 if no note", function () {
var json1 = {
key: "AAAAAAAA",
version: 1234,
title: "Link",
dateModified: "2017-04-02 12:34:56"
};
var json2 = {
key: "AAAAAAAA",
version: 1235,
title: "Link",
note: "",
noteSchemaVersion: 0,
dateModified: "2017-04-02 12:34:56"
};
var ignoreFields = ['dateAdded', 'dateModified'];
var result = Zotero.Sync.Data.Local._reconcileChangesWithoutCache(
'item', json1, json2, ignoreFields
);
assert.lengthOf(result.changes, 0);
assert.lengthOf(result.conflicts, 0);
});
it("should automatically use remote version for conflicting fields when both sides are in trash", function () {
var json1 = {
key: "AAAAAAAA",