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

Fixes freezing occuring on linux while running tests

Browse source 
server_connectorTest - alternating port prevents
exceptions not catchable in JS for httpd server when the socket
and the port remains open after httpd.stop() callback

support - changes the window on which `setTimeout()` is ran in dialogs.
If the timeout is ran on the main window the `dialog` object appears to
lose certain properties and not respond to interactions completely.
This commit is contained in:
Adomas Venčkauskas 2016-06-23 16:15:48 +03:00
parent 8bbf0bf495
commit 3f25d64984
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/content/support.js
View file

@ -137,7 +137,7 @@ function waitForDialog(onOpen, button='accept', url) {
function acceptWhenEnabled() {
// Handle delayed buttons
if (dialog.document.documentElement.getButton(button).disabled) {
setTimeout(function () {
dialog.setTimeout(function () {
acceptWhenEnabled();
}, 250);
}

4
test/tests/server_connectorTest.js
View file

@ -14,10 +14,12 @@ describe("Connector Server", function () {
win = yield loadZoteroPane();
connectorServerPath = 'http://127.0.0.1:' + Zotero.Prefs.get('httpServer.port');
testServerPath = 'http://127.0.0.1:' + testServerPort;
});
beforeEach(function () {
// Alternate ports to prevent exceptions not catchable in JS
testServerPort += (testServerPort & 1) ? 1 : -1;
testServerPath = 'http://127.0.0.1:' + testServerPort;
httpd = new HttpServer();
httpd.start(testServerPort);
});