libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

tests: Promisify helper.init()

Browse source
This commit is contained in:
Richard Hansen 2021-05-09 18:45:43 -04:00
parent c714ff1014
commit 20df34bb67
2 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/tests/frontend/helper.js
View file

@ -6,17 +6,16 @@ const helper = {};
let $iframe; let $iframe;
const jsLibraries = {}; const jsLibraries = {};
helper.init = (cb) => { helper.init = async () => {
$.get('../../static/js/vendors/jquery.js').done((code) => { [
// make sure we don't override existing jquery jsLibraries.jquery,
jsLibraries.jquery = `if(typeof $ === 'undefined') {\n${code}\n}`; jsLibraries.sendkeys,
] = await Promise.all([
$.get('lib/sendkeys.js').done((code) => { $.get('../../static/js/vendors/jquery.js'),
jsLibraries.sendkeys = code; $.get('lib/sendkeys.js'),
]);
cb(); // make sure we don't override existing jquery
}); jsLibraries.jquery = `if (typeof $ === 'undefined') {\n${jsLibraries.jquery}\n}`;
});
}; };
helper.randomString = (len) => { helper.randomString = (len) => {

24
src/tests/frontend/runner.js
View file

@ -1,6 +1,8 @@
'use strict'; 'use strict';
$(() => { // $(handler), $().ready(handler), $.wait($.ready).then(handler), etc. don't work if handler is an
// async function for some bizarre reason, so the async function is wrapped in a non-async function.
$(() => (async () => {
const stringifyException = (exception) => { const stringifyException = (exception) => {
let err = exception.stack || exception.toString(); let err = exception.stack || exception.toString();
@ -154,15 +156,11 @@ $(() => {
describe(`${desc}.js`, function () { require(spec); }); describe(`${desc}.js`, function () { require(spec); });
} }
// initialize the test helper await helper.init();
helper.init(() => { const grep = getURLParameter('grep');
// configure and start the test framework if (grep != null) {
const grep = getURLParameter('grep'); mocha.grep(grep);
if (grep != null) { }
mocha.grep(grep); const runner = mocha.run();
} customRunner(runner);
})());
const runner = mocha.run();
customRunner(runner);
});
});