mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-23 17:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Merge branch 'develop' into mochawesome

Browse source
This commit is contained in:
John McLear 2021-02-03 11:23:54 +00:00 • committed by GitHub
commit 7630e71957
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
75 changed files with 1347 additions and 1020 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tests/frontend/specs/pad_modal.js
View file

@ -100,17 +100,17 @@ describe('Pad modal', function () {
});
});
const clickOnPadInner = function () {
const clickOnPadInner = () => {
const $editor = helper.padInner$('#innerdocbody');
$editor.click();
};
const clickOnPadOuter = function () {
const clickOnPadOuter = () => {
const $lineNumbersColumn = helper.padOuter$('#sidedivinner');
$lineNumbersColumn.click();
};
const openSettingsAndWaitForModalToBeVisible = function (done) {
const openSettingsAndWaitForModalToBeVisible = (done) => {
helper.padChrome$('.buttonicon-settings').click();
// wait for modal to be displayed
@ -118,7 +118,7 @@ describe('Pad modal', function () {
helper.waitFor(() => isModalOpened(modalSelector), 10000).done(done);
};
const isEditorDisabled = function () {
const isEditorDisabled = () => {
const editorDocument = helper.padOuter$("iframe[name='ace_inner']").get(0).contentDocument;
const editorBody = editorDocument.getElementById('innerdocbody');
@ -128,7 +128,7 @@ describe('Pad modal', function () {
return editorIsDisabled;
};
const isModalOpened = function (modalSelector) {
const isModalOpened = (modalSelector) => {
const $modal = helper.padChrome$(modalSelector);
return $modal.hasClass('popup-show');