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

Show invalid-data warning in sync button tooltip for group libraries

Browse source 
Instead of showing warning button on toolbar

Otherwise if one person in a group upgrades to a beta with new fields,
everyone in the group will get a warning, even if they're already on the
latest release version. In a personal library, the user can upgrade to
the same version.
This commit is contained in:
Dan Stillman 2021-02-09 16:36:06 -05:00
parent b919143630
commit 843bcbb68a
5 changed files with 238 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

191
test/tests/syncRunnerTest.js
View file

@ -109,6 +109,63 @@ describe("Zotero.Sync.Runner", function () {
setHTTPResponse(server, baseURL, response, responses);
}
function setDefaultResponses(options = {}) {
var target = options.target || 'users/1';
var headers = {
"Last-Modified-Version": options.libraryVersion || 5
};
var lastLibraryVersion = options.lastLibraryVersion || 4;
setResponse({
method: "GET",
url: `${target}/settings?since=${lastLibraryVersion}`,
status: 200,
headers,
json: {}
});
setResponse({
method: "GET",
url: `${target}/collections?format=versions&since=${lastLibraryVersion}`,
status: 200,
headers,
json: {}
});
setResponse({
method: "GET",
url: `${target}/searches?format=versions&since=${lastLibraryVersion}`,
status: 200,
headers,
json: {}
});
setResponse({
method: "GET",
url: `${target}/items/top?format=versions&since=${lastLibraryVersion}&includeTrashed=1`,
status: 200,
headers,
json: {}
});
setResponse({
method: "GET",
url: `${target}/items?format=versions&since=${lastLibraryVersion}&includeTrashed=1`,
status: 200,
headers,
json: {}
});
setResponse({
method: "GET",
url: `${target}/deleted?since=${lastLibraryVersion}`,
status: 200,
headers,
json: {}
});
setResponse({
method: "GET",
url: `${target}/fulltext?format=versions`,
status: 200,
headers,
json: {}
});
}
//
// Tests
@ -993,28 +1050,18 @@ describe("Zotero.Sync.Runner", function () {
}
});
it("should show the sync error icon on error", function* () {
it("should show the sync error icon on error", async function () {
let library = Zotero.Libraries.userLibrary;
library.libraryVersion = 5;
yield library.save();
library.libraryVersion = 1;
await library.save();
setResponse('keyInfo.fullAccess');
setResponse('userGroups.groupVersionsEmpty');
// My Library
setResponse({
method: "GET",
url: "users/1/settings",
status: 200,
headers: {
"Last-Modified-Version": 5
},
json: {
INVALID: true // TODO: Find a cleaner error
}
});
// No other responses, so settings response will be a 404
spy = sinon.spy(runner, "updateIcons");
yield runner.sync();
await runner.sync();
assert.isTrue(spy.calledTwice);
assert.isArray(spy.args[1][0]);
assert.lengthOf(spy.args[1][0], 1);
@ -1097,6 +1144,118 @@ describe("Zotero.Sync.Runner", function () {
});
it("should show an error for invalid My Library data", async function () {
let library = Zotero.Libraries.userLibrary;
library.libraryVersion = 1;
await library.save();
var collection = await createDataObject('collection', { synced: true });
var json = collection.toResponseJSON();
json.version = json.data.version = 2;
json.data.INVALID = true;
setResponse('keyInfo.fullAccess');
setResponse('userGroups.groupVersionsEmpty');
setDefaultResponses({
lastLibraryVersion: 1,
libraryVersion: 2
});
setResponse({
method: "GET",
url: "users/1/collections?format=versions&since=1",
status: 200,
headers: {
"Last-Modified-Version": 2
},
json: {
[json.key]: 2
}
});
setResponse({
method: "GET",
url: `users/1/collections?format=json&collectionKey=${json.key}`,
status: 200,
headers: {
"Last-Modified-Version": 2
},
json: [json]
});
spy = sinon.spy(runner, "updateIcons");
await runner.sync();
assert.isTrue(spy.calledTwice);
assert.isArray(spy.args[1][0]);
assert.lengthOf(spy.args[1][0], 1);
// Not an instance of Error for some reason
var error = spy.args[1][0][0];
assert.equal(Object.getPrototypeOf(error).constructor.name, "Error");
assert.match(error.message, /^Some data in My Library/);
});
it("should show a warning in the sync button tooltip for invalid group data", async function () {
win = await loadZoteroPane();
var doc = win.document;
// Create group with same id and version as groups response
var groupData = responses.groups.memberGroup;
var group = await createGroup({
id: groupData.json.id,
version: groupData.json.version
});
group.libraryVersion = 1;
await group.save();
var collection = await createDataObject('collection', { synced: true });
var json = collection.toResponseJSON();
json.version = json.data.version = 2;
json.data.INVALID = true;
var target = 'groups/' + group.id;
setResponse('keyInfo.fullAccess');
setResponse('userGroups.groupVersionsOnlyMemberGroup');
setResponse('groups.memberGroup');
setDefaultResponses({
target,
lastLibraryVersion: 1,
libraryVersion: 2
});
setResponse({
method: "GET",
url: target + '/collections?format=versions&since=1',
status: 200,
headers: {
"Last-Modified-Version": 2
},
json: {
[json.key]: 2
}
});
setResponse({
method: "GET",
url: target + `/collections?format=json&collectionKey=${json.key}`,
status: 200,
headers: {
"Last-Modified-Version": 2
},
json: [json]
});
await runner.sync({ libraries: [group.libraryID] });
assert.isTrue(doc.getElementById('zotero-tb-sync-error').hidden);
// Fake what happens on button mouseover
var tooltip = doc.getElementById('zotero-tb-sync-tooltip');
runner.registerSyncStatus(tooltip);
var html = doc.getElementById('zotero-tb-sync-tooltip').innerHTML;
assert.match(html, /Some data in .+\. Other data will continue to sync\./);
runner.registerSyncStatus();
});
// TODO: Test multiple long tags and tags across libraries
describe("Long Tag Fixer", function () {
it("should split a tag", function* () {