www

commit 723b4d32e5eb5116d3b81f38eaab73870789e5a0
parent 58150885866c1afba9e3c5519306228f945b543b
Author: Martynas Bagdonas <martbgd@gmail.com>
Date:   Thu, 18 Jan 2018 16:48:44 +0200

Fix Zotero.Fulltext tests

Diffstat:
M
test/content/runtests.js
 | 
27
+--------------------------
M
test/content/support.js
 | 
31
+++++++++++++++++++++++++++++++
M
test/tests/fulltextTest.js
 | 
3
++-
M
test/tests/recognizePDFTest.js
 | 
1
+

4 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/test/content/runtests.js b/test/content/runtests.js
@@ -294,32 +294,7 @@ if(run) {
 		Zotero.spawn(function* () {
 			yield Zotero.Schema.schemaUpdatePromise;
 			
-			// Init paths for PDF tools and data
-			let pdfConvertedFileName = 'pdftotext';
-			let pdfInfoFileName = 'pdfinfo';
-			
-			if (Zotero.isWin) {
-				pdfConvertedFileName += '-win.exe';
-				pdfInfoFileName += '-win.exe';
-			}
-			else if (Zotero.isMac) {
-				pdfConvertedFileName += '-mac';
-				pdfInfoFileName += '-mac';
-			}
-			else {
-				let cpu = Zotero.platform.split(' ')[1];
-				pdfConvertedFileName += '-linux-' + cpu;
-				pdfInfoFileName += '-linux-' + cpu;
-			}
-			
-			let pdfToolsPath = OS.Path.join(Zotero.Profile.dir, 'pdftools');
-			let pdfConverterPath = OS.Path.join(pdfToolsPath, pdfConvertedFileName);
-			let pdfInfoPath = OS.Path.join(pdfToolsPath, pdfInfoFileName);
-			let pdfDataPath = OS.Path.join(pdfToolsPath, 'poppler-data');
-			
-			Zotero.FullText.setPDFConverterPath(pdfConverterPath);
-			Zotero.FullText.setPDFInfoPath(pdfInfoPath);
-			Zotero.FullText.setPDFDataPath(pdfDataPath);
+			initPDFToolsPath();
 			
 			return mocha.run();
 		})
diff --git a/test/content/support.js b/test/content/support.js
@@ -474,6 +474,37 @@ function getPromiseError(promise) {
 }
 
 /**
+ * Init paths for PDF tools and data
+ */
+function initPDFToolsPath() {
+	let pdfConvertedFileName = 'pdftotext';
+	let pdfInfoFileName = 'pdfinfo';
+	
+	if (Zotero.isWin) {
+		pdfConvertedFileName += '-win.exe';
+		pdfInfoFileName += '-win.exe';
+	}
+	else if (Zotero.isMac) {
+		pdfConvertedFileName += '-mac';
+		pdfInfoFileName += '-mac';
+	}
+	else {
+		let cpu = Zotero.platform.split(' ')[1];
+		pdfConvertedFileName += '-linux-' + cpu;
+		pdfInfoFileName += '-linux-' + cpu;
+	}
+	
+	let pdfToolsPath = OS.Path.join(Zotero.Profile.dir, 'pdftools');
+	let pdfConverterPath = OS.Path.join(pdfToolsPath, pdfConvertedFileName);
+	let pdfInfoPath = OS.Path.join(pdfToolsPath, pdfInfoFileName);
+	let pdfDataPath = OS.Path.join(pdfToolsPath, 'poppler-data');
+	
+	Zotero.FullText.setPDFConverterPath(pdfConverterPath);
+	Zotero.FullText.setPDFInfoPath(pdfInfoPath);
+	Zotero.FullText.setPDFDataPath(pdfDataPath);
+}
+
+/**
  * Returns the nsIFile corresponding to the test data directory
  * (i.e., test/tests/data)
  */
diff --git a/test/tests/fulltextTest.js b/test/tests/fulltextTest.js
@@ -5,6 +5,7 @@ describe("Zotero.Fulltext", function () {
 		// Hidden browser, which requires a browser window, needed for charset detection
 		// (until we figure out a better way)
 		win = yield loadBrowserWindow();
+		initPDFToolsPath();
 	});
 	after(function () {
 		if (win) {
@@ -133,7 +134,7 @@ describe("Zotero.Fulltext", function () {
 			toSync.push({
 				item: pdfAttachment,
 				content: "Zotero [zoh-TAIR-oh] is a free, easy-to-use tool to help you collect, "
-					+ "organize, cite, and share your research sources.\n\n",
+					+ "organize, cite, and share\nyour research sources.\n\n",
 				indexedChars: 0,
 				indexedPages: 1
 			});
diff --git a/test/tests/recognizePDFTest.js b/test/tests/recognizePDFTest.js
@@ -9,6 +9,7 @@ describe("PDF Recognition", function() {
 		yield Zotero.Promise.all([
 			loadZoteroPane().then(w => win = w)
 		]);
+		initPDFToolsPath();
 	});
 	
 	beforeEach(function* () {