From bff7cee374497389689753e3a92a1467f2953bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Wed, 28 Mar 2018 14:55:46 +0300
Subject: [PATCH] Add a test case for copied citations (for 9c7271c6)

---
 chrome/content/zotero/xpcom/integration.js |  2 +-
 test/tests/integrationTest.js              | 38 +++++++++++++++++++++-
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
index 1bbd0a63c..9af609e4d 100644
--- a/chrome/content/zotero/xpcom/integration.js
+++ b/chrome/content/zotero/xpcom/integration.js
@@ -1570,7 +1570,7 @@ Zotero.Integration.Session.prototype.addCitation = Zotero.Promise.coroutine(func
 		}
 		if(needNewID) {
 			Zotero.debug("Integration: "+citation.citationID+" ("+index+") needs new citationID");
-			citation.citationID = Zotero.randomString();
+			citation.citationID = Zotero.Utilities.randomString();
 		}
 		this.newIndices[index] = true;
 	}
diff --git a/test/tests/integrationTest.js b/test/tests/integrationTest.js
index 026aabf2e..bc9d49a7a 100644
--- a/test/tests/integrationTest.js
+++ b/test/tests/integrationTest.js
@@ -572,7 +572,7 @@ describe("Zotero.Integration", function () {
 				});
 			});
 			
-			describe('when there are duplicated citations (copy-paste)', function() {
+			describe('when there are copy-pasted citations', function() {
 				it('should resolve duplicate citationIDs and mark both as new citations', async function() {
 					var docID = this.test.fullTitle();
 					if (!(docID in applications)) initDoc(docID);
@@ -602,6 +602,42 @@ describe("Zotero.Integration", function () {
 						stubUpdateDocument.restore();
 					}
 				});
+				
+				it('should successfully process citations copied in from another doc', async function() {
+					var docID = this.test.fullTitle();
+					if (!(docID in applications)) initDoc(docID);
+					var doc = applications[docID].doc;
+
+					setAddEditItems(testItems[0]);
+					await execCommand('addEditCitation', docID);
+					assert.equal(doc.fields.length, 1);
+					doc.fields.push(new DocumentPluginDummy.Field(doc));
+					// Add a "citation copied from somewhere else"
+					// the content doesn't really matter, just make sure that the citationID is different
+					var newCitationID = Zotero.Utilities.randomString();
+					doc.fields[1].code = doc.fields[0].code;
+					doc.fields[1].code = doc.fields[1].code.replace(/"citationID":"[A-Za-z0-9^"]*"/,
+						`"citationID":"${newCitationID}"`);
+					doc.fields[1].text = doc.fields[0].text;
+					
+					var originalUpdateDocument = Zotero.Integration.Fields.prototype.updateDocument;
+					var stubUpdateDocument = sinon.stub(Zotero.Integration.Fields.prototype, 'updateDocument');
+					try {
+						var indices;
+						stubUpdateDocument.callsFake(function() {
+							indices = Object.keys(Zotero.Integration.currentSession.newIndices);
+							return originalUpdateDocument.apply(this, arguments);
+						});
+
+						setAddEditItems(testItems[1]);
+						await execCommand('addEditCitation', docID);
+						assert.equal(indices.length, 2);
+						assert.include(indices, '1');
+						assert.include(indices, '2');
+					} finally {
+						stubUpdateDocument.restore();
+					}
+				});
 			});
 			
 			describe('when delayCitationUpdates is set', function() {