www

commit f6510419cbe32832a76a556564deb0457199d53c
parent ac363101fc0f3d1cc600197fe3909827d0a7dc02
Author: Aurimas Vinckevicius <aurimas.dev@gmail.com>
Date:   Mon, 30 Mar 2015 23:52:38 -0500

Skip test for "recognizePDF without DOI" on Travis-CI
Breaks due to CAPTCHA when tests are run frequently

Diffstat:
M
chrome/content/zotero/xpcom/zotero.js
 | 
1
+
M
components/zotero-service.js
 | 
4
++++
M
test/runtests.sh
 | 
6
+++++-
M
test/tests/recognizePDF.js
 | 
2
++

4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/zotero.js b/chrome/content/zotero/xpcom/zotero.js
@@ -210,6 +210,7 @@ Components.utils.import("resource://gre/modules/Services.jsm");
 		
 		if (options) {
 			if (options.openPane) this.openPane = true;
+			if (options.noUserInput) this.noUserInput = true;
 		}
 		
 		this.mainThread = Components.classes["@mozilla.org/thread-manager;1"].getService().mainThread;
diff --git a/components/zotero-service.js b/components/zotero-service.js
@@ -447,6 +447,10 @@ ZoteroCommandLineHandler.prototype = {
 				}
 			}
 		}
+		
+		if (cmdLine.handleFlag("ZoteroNoUserInput", false)) {
+			zInitOptions.noUserInput = true;
+		}
 	},
 	
 	contractID: "@mozilla.org/commandlinehandler/general-startup;1?type=zotero",
diff --git a/test/runtests.sh b/test/runtests.sh
@@ -77,11 +77,15 @@ user_pref("extensions.zotero.firstRunGuidance", false);
 user_pref("extensions.zotero.firstRun2", false);
 EOF
 
-
+# -v flag on Windows makes Firefox process hang
 if [ -z $IS_CYGWIN ]; then
 	echo "`MOZ_NO_REMOTE=1 NO_EM_RESTART=1 \"$FX_EXECUTABLE\" -v`"
 fi
 
+if [ "$TRAVIS" = true ]; then
+	FX_ARGS="$FX_ARGS --ZoteroNoUserInput"
+fi
+
 makePath FX_PROFILE "$PROFILE"
 MOZ_NO_REMOTE=1 NO_EM_RESTART=1 "$FX_EXECUTABLE" -profile "$FX_PROFILE" \
     -chrome chrome://zotero-unit/content/runtests.html -test "$TESTS" $FX_ARGS
diff --git a/test/tests/recognizePDF.js b/test/tests/recognizePDF.js
@@ -38,6 +38,8 @@ describe("PDF Recognition", function() {
 	});
 
 	it("should recognize a PDF without a DOI", function() {
+		if (Zotero.noUserInput) this.skip(); // CAPTCHAs make this fail
+		
 		this.timeout(30000);
 		// Import the PDF
 		var testdir = getTestDataDirectory();