Fix integration test errors. Closes zotero#1426

Juris-M · Jan 25, 2018 · d857a81 · d857a81
1 parent fe4b757
commit d857a81
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/chrome/content/zotero/xpcom/integration.js b/chrome/content/zotero/xpcom/integration.js
@@ -2180,10 +2180,10 @@ Zotero.Integration.CitationField = class extends Zotero.Integration.Field {
 
 			return {"citationItems":citationItems, properties:{}};
 		}
-
 
+
+		let code = this.getCode();
 		try {
-			let code = this.getCode();
 			if (code[0] == '{') {		// JSON field
 				return upgradeCruft(unserialize(code), code);
 			} else {				// ye olde style field

diff --git a/test/tests/integrationTest.js b/test/tests/integrationTest.js
@@ -444,14 +444,14 @@ describe("Zotero.Integration", function () {
 				setAddEditItems(testItems[0]);
 				yield execCommand('addEditCitation', docID);
 				assert.equal(doc.fields.length, 1);
-				var citation = (new Zotero.Integration.CitationField(doc.fields[0])).unserialize();
+				var citation = (new Zotero.Integration.CitationField(doc.fields[0], doc.fields[0].code)).unserialize();
 				assert.equal(citation.citationItems.length, 1);
 				assert.equal(citation.citationItems[0].id, testItems[0].id);
 
 				setAddEditItems(testItems.slice(1, 3));
 				yield execCommand('addEditCitation', docID);
 				assert.equal(doc.fields.length, 2);
-				citation = (new Zotero.Integration.CitationField(doc.fields[1])).unserialize();
+				citation = (new Zotero.Integration.CitationField(doc.fields[1], doc.fields[1].code)).unserialize();
 				assert.equal(citation.citationItems.length, 2);
 				for (let i = 1; i < 3; i++) {
 					assert.equal(citation.citationItems[i-1].id, testItems[i].id);
@@ -470,7 +470,7 @@ describe("Zotero.Integration", function () {
 				setAddEditItems(testItems.slice(3, 5));
 				yield execCommand('addEditCitation', docID);
 				assert.equal(doc.fields.length, 2);
-				var citation = (new Zotero.Integration.CitationField(doc.fields[0])).unserialize();
+				var citation = (new Zotero.Integration.CitationField(doc.fields[0], doc.fields[0].code)).unserialize();
 				assert.equal(citation.citationItems.length, 2);
 				assert.equal(citation.citationItems[0].id, testItems[3].id);
 			});
@@ -543,7 +543,7 @@ describe("Zotero.Integration", function () {
 					var docID = this.test.fullTitle();
 					var doc = applications[docID].doc;
 
-					var citation = (new Zotero.Integration.CitationField(doc.fields[0])).unserialize();
+					var citation = (new Zotero.Integration.CitationField(doc.fields[0], doc.fields[0].code)).unserialize();
 					assert.isNotOk(citation.properties.dontUpdate);
 					doc.fields[0].text = "modified";
 					// Return Yes
@@ -553,15 +553,15 @@ describe("Zotero.Integration", function () {
 					assert.isTrue(displayAlertStub.called);
 					assert.equal(doc.fields.length, 2);
 					assert.equal(doc.fields[0].text, "modified");
-					var citation = (new Zotero.Integration.CitationField(doc.fields[0])).unserialize();
+					var citation = (new Zotero.Integration.CitationField(doc.fields[0], doc.fields[0].code)).unserialize();
 					assert.isOk(citation.properties.dontUpdate);
 				});
 				it('should reset citation text if "no" selected in refresh prompt', async function() {
 					await insertMultipleCitations.call(this);
 					var docID = this.test.fullTitle();
 					var doc = applications[docID].doc;
 
-					var citation = (new Zotero.Integration.CitationField(doc.fields[0])).unserialize();
+					var citation = (new Zotero.Integration.CitationField(doc.fields[0], doc.fields[0].code)).unserialize();
 					assert.isNotOk(citation.properties.dontUpdate);
 					let origText = doc.fields[0].text;
 					doc.fields[0].text = "modified";
@@ -572,7 +572,7 @@ describe("Zotero.Integration", function () {
 					assert.isTrue(displayAlertStub.called);
 					assert.equal(doc.fields.length, 2);
 					assert.equal(doc.fields[0].text, origText);
-					var citation = (new Zotero.Integration.CitationField(doc.fields[0])).unserialize();
+					var citation = (new Zotero.Integration.CitationField(doc.fields[0], doc.fields[0].code)).unserialize();
 					assert.isNotOk(citation.properties.dontUpdate);
 				});
 			});