www

commit 3415cefa713f675147ecee6ec8c29bbf194351e5
parent 90c49806f94b8d98a58a59137ab2a393cb58b321
Author: Simon Kornblith <simon@simonster.com>
Date:   Mon,  9 Mar 2015 20:10:19 -0400

Merge pull request #601 from aurimasv/defer

Allow meta redirects when running web translator tests
Diffstat:
M
chrome/content/zotero/tools/testTranslators/translatorTester.js
 | 
15
+++++++++++++--

1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/tools/testTranslators/translatorTester.js b/chrome/content/zotero/tools/testTranslators/translatorTester.js
@@ -195,6 +195,8 @@ Zotero_TranslatorTester = function(translator, type, debugCallback) {
 	}
 };
 
+Zotero_TranslatorTester.DEFER_DELAY = 30000; // Delay for deferred tests
+
 /**
  * Removes document objects, which contain cyclic references, and other fields to be ignored from items
  * @param {Object} Item, in the format returned by Zotero.Item.serialize()
@@ -317,7 +319,7 @@ Zotero_TranslatorTester.prototype._runTestsRecursively = function(testDoneCallba
 	var testNumber = this.tests.length-this.pending.length;
 	var me = this;
 	
-	this._debug(this, "\nTranslatorTester: Running "+this.translator.label+" Test "+testNumber);
+	this._debug(this, "TranslatorTester: Running "+this.translator.label+" Test "+testNumber);
 	
 	var executedCallback = false;
 	var callback = function(obj, test, status, message) {
@@ -374,7 +376,14 @@ Zotero_TranslatorTester.prototype.fetchPageAndRunTest = function(test, testDoneC
 	var hiddenBrowser = Zotero.HTTP.processDocuments(test.url,
 		function(doc) {
 			if(test.defer) {
-				Zotero.setTimeout(function() { runTest(doc) }, 30000, true);
+				me._debug(this, "TranslatorTesting: Waiting "
+					+ (Zotero_TranslatorTester.DEFER_DELAY/1000)
+					+ " second(s) for page content to settle"
+				);
+				Zotero.setTimeout(
+					function() {runTest(hiddenBrowser.contentDocument) },
+					Zotero_TranslatorTester.DEFER_DELAY, true
+				);
 			} else {
 				runTest(doc);
 			}
@@ -385,6 +394,8 @@ Zotero_TranslatorTester.prototype.fetchPageAndRunTest = function(test, testDoneC
 		},
 		true
 	);
+	
+	hiddenBrowser.docShell.allowMetaRedirects = true;
 };
 
 /**