mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Scaffold: Use loadDocuments() for tests and honor defer: true

Browse source 
Previously, while updating a test used loadDocuments() (for a real
browser load) and honored `defer: true`, running a test did not.

This updates Zotero_TranslatorTester to use loadDocuments() when run in
Zotero. In other environments (translation-server, connector), it will
continue to use processDocuments(), which is based on XHR.

Fixes zotero/scaffold#96
This commit is contained in:
Dan Stillman 2020-05-15 19:11:03 -04:00
parent 0341b8e99a
commit 4068dffc0f
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
chrome/content/zotero/tools/testTranslators/translatorTester.js
View file

@ -413,6 +413,33 @@ Zotero_TranslatorTester.prototype._runTestsRecursively = function(testDoneCallba
* @param {Function} testDoneCallback - A callback to be executed when test is complete
*/
Zotero_TranslatorTester.prototype.fetchPageAndRunTest = function (test, testDoneCallback) {
// Scaffold
if (Zotero.isFx) {
let browser = Zotero.HTTP.loadDocuments(
test.url,
(doc) => {
if (test.defer) {
Zotero.debug("Waiting " + (Zotero_TranslatorTester.DEFER_DELAY / 1000)
+ " second(s) for page content to settle");
}
setTimeout(() => {
this.runTest(test, doc, function (obj, test, status, message) {
Zotero.Browser.deleteHiddenBrowser(browser);
testDoneCallback(obj, test, status, message);
});
}, test.defer ? Zotero_TranslatorTester.DEFER_DELAY : 0);
},
null,
(e) => {
Zotero.Browser.deleteHiddenBrowser(browser);
testDoneCallback(this, test, "failed", "Translation failed to initialize: " + e);
},
true
);
browser.docShell.allowMetaRedirects = true;
return
}
if (typeof process === 'object' && process + '' === '[object process]'){
this._cookieSandbox = require('request').jar();
}