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

Fix annotation tests for recent changes

Browse source
This commit is contained in:
Dan Stillman 2020-12-27 22:18:17 -05:00
parent 55c6de23ba
commit 9997ece0d2
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
test/tests/annotationsTest.js
View file

@ -53,7 +53,7 @@ describe("Zotero.Annotations", function() {
"key": "QD32MQJF", "key": "QD32MQJF",
"type": "image", "type": "image",
"isAuthor": true, "isAuthor": true,
"imageURL": "zotero://attachment/library/items/LB417FR4", "image": "zotero://attachment/library/items/LB417FR4",
"comment": "This is a comment", "comment": "This is a comment",
"color": "#ffec00", "color": "#ffec00",
"pageLabel": "XVI", "pageLabel": "XVI",
@ -136,7 +136,7 @@ describe("Zotero.Annotations", function() {
annotation.addTag("chemistry"); annotation.addTag("chemistry");
await annotation.saveTx(); await annotation.saveTx();
await Zotero.Tags.setColor(annotation.libraryID, "math", "#ff0000", 0); await Zotero.Tags.setColor(annotation.libraryID, "math", "#ff0000", 0);
var json = Zotero.Annotations.toJSON(annotation); var json = await Zotero.Annotations.toJSON(annotation);
assert.sameMembers(Object.keys(json), Object.keys(exampleHighlight)); assert.sameMembers(Object.keys(json), Object.keys(exampleHighlight));
for (let prop of Object.keys(exampleHighlight)) { for (let prop of Object.keys(exampleHighlight)) {
@ -161,7 +161,7 @@ describe("Zotero.Annotations", function() {
annotation[itemProp] = exampleNoteAlt[prop]; annotation[itemProp] = exampleNoteAlt[prop];
} }
await annotation.saveTx(); await annotation.saveTx();
var json = Zotero.Annotations.toJSON(annotation); var json = await Zotero.Annotations.toJSON(annotation);
assert.sameMembers(Object.keys(json), Object.keys(exampleNote)); assert.sameMembers(Object.keys(json), Object.keys(exampleNote));
for (let prop of Object.keys(exampleNote)) { for (let prop of Object.keys(exampleNote)) {
@ -194,22 +194,31 @@ describe("Zotero.Annotations", function() {
for (let i = 0; i < imageData.length; i++) { for (let i = 0; i < imageData.length; i++) {
array[i] = imageData.charCodeAt(i); array[i] = imageData.charCodeAt(i);
} }
var blob = new Blob([array], { type: 'image/png' });
var imageAttachment = await Zotero.Attachments.importEmbeddedImage({ var imageAttachment = await Zotero.Attachments.importEmbeddedImage({
blob: new Blob([array], { type: 'image/png' }), blob,
parentItemID: annotation.id parentItemID: annotation.id
}); });
var json = Zotero.Annotations.toJSON(annotation); var json = await Zotero.Annotations.toJSON(annotation);
assert.sameMembers(Object.keys(json), Object.keys(exampleImage)); assert.sameMembers(Object.keys(json), Object.keys(exampleImage));
for (let prop of Object.keys(exampleImage)) { for (let prop of Object.keys(exampleImage)) {
if (prop == 'imageURL' if (prop == 'image'
|| prop == 'dateModified') { || prop == 'dateModified') {
continue; continue;
} }
assert.deepEqual(json[prop], exampleImage[prop], `'${prop}' doesn't match`); assert.deepEqual(json[prop], exampleImage[prop], `'${prop}' doesn't match`);
} }
assert.equal(json.imageURL, `zotero://attachment/library/items/${imageAttachment.key}`);
var imageVal = await new Zotero.Promise((resolve) => {
var reader = new FileReader();
reader.readAsDataURL(blob);
reader.onloadend = function() {
resolve(reader.result);
}
});
assert.equal(json.image, imageVal);
await annotation.eraseTx(); await annotation.eraseTx();
}); });
@ -229,7 +238,7 @@ describe("Zotero.Annotations", function() {
annotation[itemProp] = exampleGroupHighlightAlt[prop]; annotation[itemProp] = exampleGroupHighlightAlt[prop];
} }
await annotation.saveTx(); await annotation.saveTx();
var json = Zotero.Annotations.toJSON(annotation); var json = await Zotero.Annotations.toJSON(annotation);
assert.isFalse(json.isAuthor); assert.isFalse(json.isAuthor);
assert.equal(json.authorName, 'Kate Smith'); assert.equal(json.authorName, 'Kate Smith');