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-19 14:13:34 +01:00
Code Issues Projects Releases Wiki Activity

tests: Remove unnecessary includeJquery parameter

Browse source
This commit is contained in:
Richard Hansen 2021-07-22 13:28:17 -04:00 committed by webzwo0i
parent ed6fa9400a
commit 01184cd1aa
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@ const helper = {};
return randomstring;
};
const getFrameJQuery = async ($iframe, includeJquery = false, includeSendkeys = false) => {
const getFrameJQuery = async ($iframe, includeSendkeys = false) => {
const win = $iframe[0].contentWindow;
const doc = win.document;
@ -36,7 +36,7 @@ const helper = {};
await p;
};
if (!win.$ && includeJquery) await load('../../static/js/vendors/jquery.js');
if (!win.$) await load('../../static/js/vendors/jquery.js');
if (!win.bililiteRange && includeSendkeys) await load('../tests/frontend/lib/sendkeys.js');
win.$.window = win;
@ -121,7 +121,7 @@ const helper = {};
// set new iframe
$('#iframe-container').append($iframe);
await new Promise((resolve) => $iframe.one('load', resolve));
helper.padChrome$ = await getFrameJQuery($('#iframe-container iframe'), true, true);
helper.padChrome$ = await getFrameJQuery($('#iframe-container iframe'), true);
helper.padChrome$.padeditor =
helper.padChrome$.window.require('ep_etherpad-lite/static/js/pad_editor').padeditor;
if (opts.clearCookies) {
@ -137,10 +137,8 @@ const helper = {};
if (opts._retry++ >= 4) throw new Error('Pad never loaded');
return await helper.aNewPad(opts);
}
helper.padOuter$ = await getFrameJQuery(
helper.padChrome$('iframe[name="ace_outer"]'), true, false);
helper.padInner$ = await getFrameJQuery(
helper.padOuter$('iframe[name="ace_inner"]'), true, true);
helper.padOuter$ = await getFrameJQuery(helper.padChrome$('iframe[name="ace_outer"]'), false);
helper.padInner$ = await getFrameJQuery(helper.padOuter$('iframe[name="ace_inner"]'), true);
// disable all animations, this makes tests faster and easier
helper.padChrome$.fx.off = true;
@ -183,7 +181,7 @@ const helper = {};
// set new iframe
$('#iframe-container').append($iframe);
$iframe.one('load', async () => {
helper.admin$ = await getFrameJQuery($('#iframe-container iframe'), true, false);
helper.admin$ = await getFrameJQuery($('#iframe-container iframe'), false);
});
};

10
src/tests/frontend/helper/multipleUsers.js
View file

@ -34,11 +34,11 @@ helper.multipleUsers = {
},
async _loadJQueryForUser1Frame() {
this._user1.padChrome$ = await getFrameJQuery(this._user1.$frame, true, true);
this._user1.padChrome$ = await getFrameJQuery(this._user1.$frame, true);
this._user1.padOuter$ =
await getFrameJQuery(this._user1.padChrome$('iframe[name="ace_outer"]'), true, false);
await getFrameJQuery(this._user1.padChrome$('iframe[name="ace_outer"]'), false);
this._user1.padInner$ =
await getFrameJQuery(this._user1.padOuter$('iframe[name="ace_inner"]'), true, true);
await getFrameJQuery(this._user1.padOuter$('iframe[name="ace_inner"]'), true);
// update helper vars now that they are available
helper.padChrome$ = this._user1.padChrome$;
@ -80,7 +80,7 @@ helper.multipleUsers = {
};
// copied from helper.js
const getFrameJQuery = async ($iframe, includeJquery = false, includeSendkeys = false) => {
const getFrameJQuery = async ($iframe, includeSendkeys = false) => {
const win = $iframe[0].contentWindow;
const doc = win.document;
@ -101,7 +101,7 @@ const getFrameJQuery = async ($iframe, includeJquery = false, includeSendkeys =
await p;
};
if (!win.$ && includeJquery) await load('../../static/js/vendors/jquery.js');
if (!win.$) await load('../../static/js/vendors/jquery.js');
if (!win.bililiteRange && includeSendkeys) await load('../tests/frontend/lib/sendkeys.js');
win.$.window = win;