Merge remote-tracking branch 'noctux/feature-attachment-urls' into at…

…tachments
zotero · Dec 5, 2019 · 53ab395 · 53ab395
2 parents a056f76 + 943a543
commit 53ab395
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 11 deletions.
diff --git a/src/utilities.js b/src/utilities.js
@@ -157,13 +157,16 @@ Zotero.Utilities.itemToAPIJSON = function(item) {
 					Zotero.debug("itemToAPIJSON: Discarded attachment: not an URL");
 					continue;
 				}
-				newItems.push({
+				var apiItem = {
 					itemType:   "attachment",
 					parentItem: newItem.key,
-					title:      attachment.title.toString(),
 					mimeType:   attachment.mimeType.toString(),
 					url:        attachment.url.toString(),
-				});
+				};
+				if (attachment.title) { // Optional field member, not all attachments have a title
+					apiItem['title'] = attachment.title.toString();
+				}
+				newItems.push(apiItem);
 			}
 		} else if((fieldID = Zotero.ItemFields.getID(field))) {
 			// if content is not a string, either stringify it or delete it

diff --git a/test/search_test.js b/test/search_test.js
@@ -120,9 +120,13 @@ describe("/search", function () {
 		assert.equal(response.statusCode, 200);
 		var json = response.body;
 
-		assert.lengthOf(json, 1);
+		assert.lengthOf(json, 2);
 		assert.equal(json[0].itemType, 'journalArticle');
 		assert.equal(json[0].title, articleTitle1);
+		// This item contains an attachment (URL)
+		assert.equal(json[1].itemType, 'attachment');
+		assert.equal(json[1].parentItem, json[0].key);
+		assert.equal(json[1].mimeType, 'text/html');
 	});
 
 	it("should translate a PMID with 'pmid:' prefix", async function () {
@@ -133,8 +137,12 @@ describe("/search", function () {
 		assert.equal(response.statusCode, 200);
 		var json = response.body;
 
-		assert.lengthOf(json, 1);
+		assert.lengthOf(json, 2);
 		assert.equal(json[0].itemType, 'journalArticle');
 		assert.equal(json[0].title, articleTitle1);
+		// This item contains an attachment (URL)
+		assert.equal(json[1].itemType, 'attachment');
+		assert.equal(json[1].parentItem, json[0].key);
+		assert.equal(json[1].mimeType, 'text/html');
 	});
 });
diff --git a/test/web_test.js b/test/web_test.js
@@ -24,10 +24,14 @@ describe("/web", function () {
 			.send(url);
 		assert.equal(response.statusCode, 200);
 		var json = response.body;
-
-		assert.lengthOf(json, 1);
+		assert.lengthOf(json, 2);
 		assert.equal(json[0].itemType, 'journalArticle');
 		assert.equal(json[0].title, 'Title');
+		// This item contains an snapshot
+		assert.equal(json[1].itemType, 'attachment');
+		assert.equal(json[1].parentItem, json[0].key);
+		assert.equal(json[1].mimeType, 'text/html');
+		assert.equal(json[1].url, url);
 	});
 
 
@@ -50,9 +54,11 @@ describe("/web", function () {
 			.send(json);
 		assert.equal(response.statusCode, 200);
 		json = response.body;
-		assert.lengthOf(json, 2);
+		assert.lengthOf(json, 3);
 		assert.equal(json[0].title, 'A');
-		assert.equal(json[1].title, 'C');
+		assert.equal(json[1].parentItem, json[0].key);
+		assert.equal(json[1].url, url);
+		assert.equal(json[2].title, 'C');
 	});
 
 
@@ -66,10 +72,15 @@ describe("/web", function () {
 		assert.equal(response.statusCode, 200);
 		var json = response.body;
 
-		assert.lengthOf(json, 1);
+		assert.lengthOf(json, 2);
 		assert.equal(json[0].itemType, 'journalArticle');
 		assert.equal(json[0].title, 'Title');
 		assert.equal(json[0].url, finalURL);
+		// This item contains an snapshot
+		assert.equal(json[1].itemType, 'attachment');
+		assert.equal(json[1].parentItem, json[0].key);
+		assert.equal(json[1].mimeType, 'text/html');
+		assert.equal(json[1].url, finalURL);
 	});
 
 
@@ -110,9 +121,14 @@ describe("/web", function () {
 		assert.equal(response.statusCode, 200);
 		var json = response.body;
 
-		assert.lengthOf(json, 1);
+		assert.lengthOf(json, 2);
 		assert.equal(json[0].itemType, 'journalArticle');
 		assert.equal(json[0].title, 'Titre');
+		// This item contains an snapshot
+		assert.equal(json[1].itemType, 'attachment');
+		assert.equal(json[1].parentItem, json[0].key);
+		assert.equal(json[1].mimeType, 'text/html');
+		assert.equal(json[1].url, url);
 	});
 
 	it("should reject non-HTML/XML upstream content types", async function () {