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

lint: Fix bugs and style issues introduced in PR #4718

Browse source 
This fixes issues introduced in commit
f8a19c4527.
This commit is contained in:
Richard Hansen 2021-02-07 01:57:37 -05:00 committed by John McLear
parent 0ff8274d2e
commit 294f2a251f
6 changed files with 165 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/tests/frontend/specs/drag_and_drop.js
View file

@ -27,9 +27,7 @@ describe('drag and drop', function () {
const originalHTML = helper.padInner$('body').html(); const originalHTML = helper.padInner$('body').html();
const $undoButton = helper.padChrome$('.buttonicon-undo'); const $undoButton = helper.padChrome$('.buttonicon-undo');
$undoButton.click(); $undoButton.click();
await helper.waitForPromise( await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
() => originalHTML !== helper.padInner$('body').html()
);
}); });
it('moves text back to its original place', function (done) { it('moves text back to its original place', function (done) {
@ -66,9 +64,7 @@ describe('drag and drop', function () {
const originalHTML = helper.padInner$('body').html(); const originalHTML = helper.padInner$('body').html();
const $undoButton = helper.padChrome$('.buttonicon-undo'); const $undoButton = helper.padChrome$('.buttonicon-undo');
$undoButton.click(); $undoButton.click();
await helper.waitForPromise( await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
() => originalHTML !== helper.padInner$('body').html()
);
}); });
it('moves text back to its original place', function (done) { it('moves text back to its original place', function (done) {

220
src/tests/frontend/specs/ordered_list.js
View file

@ -1,135 +1,137 @@
'use strict'; 'use strict';
describe('assign ordered list', function () { describe('ordered_list.js', function () {
// create a new pad before each test run describe('assign ordered list', function () {
beforeEach(function (cb) { // create a new pad before each test run
helper.newPad(cb); beforeEach(function (cb) {
this.timeout(60000); helper.newPad(cb);
}); this.timeout(60000);
it('inserts ordered list text', function (done) {
const inner$ = helper.padInner$;
const chrome$ = helper.padChrome$;
const $insertorderedlistButton = chrome$('.buttonicon-insertorderedlist');
$insertorderedlistButton.click();
helper.waitFor(() => inner$('div').first().find('ol li').length === 1).done(done);
});
context('when user presses Ctrl+Shift+N', function () {
context('and pad shortcut is enabled', function () {
beforeEach(async function () {
const originalHTML = helper.padInner$('body').html();
makeSureShortcutIsEnabled('cmdShiftN');
triggerCtrlShiftShortcut('N');
await helper.waitForPromise(
() => helper.padInner$('body').html !== originalHTML);
});
it('inserts unordered list', function (done) {
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1).done(done);
});
}); });
context('and pad shortcut is disabled', function () { it('inserts ordered list text', function (done) {
beforeEach(async function () { const inner$ = helper.padInner$;
const originalHTML = helper.padInner$('body').html(); const chrome$ = helper.padChrome$;
makeSureShortcutIsDisabled('cmdShiftN');
triggerCtrlShiftShortcut('N'); const $insertorderedlistButton = chrome$('.buttonicon-insertorderedlist');
await helper.waitForPromise( $insertorderedlistButton.click();
() => helper.padInner$('body').html !== originalHTML);
helper.waitFor(() => inner$('div').first().find('ol li').length === 1).done(done);
});
context('when user presses Ctrl+Shift+N', function () {
context('and pad shortcut is enabled', function () {
beforeEach(async function () {
const originalHTML = helper.padInner$('body').html();
makeSureShortcutIsEnabled('cmdShiftN');
triggerCtrlShiftShortcut('N');
await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
});
it('inserts unordered list', function (done) {
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1)
.done(done);
});
}); });
it('does not insert unordered list', function (done) { context('and pad shortcut is disabled', function () {
helper.waitFor( beforeEach(async function () {
() => helper.padInner$('div').first().find('ol li').length === 1).done(() => { const originalHTML = helper.padInner$('body').html();
expect().fail(() => 'Unordered list inserted, should ignore shortcut'); makeSureShortcutIsDisabled('cmdShiftN');
}).fail(() => { triggerCtrlShiftShortcut('N');
done(); await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
});
it('does not insert unordered list', function (done) {
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1)
.done(() => {
expect().fail(() => 'Unordered list inserted, should ignore shortcut');
})
.fail(() => {
done();
});
}); });
}); });
}); });
});
context('when user presses Ctrl+Shift+1', function () { context('when user presses Ctrl+Shift+1', function () {
context('and pad shortcut is enabled', function () { context('and pad shortcut is enabled', function () {
beforeEach(async function () { beforeEach(async function () {
const originalHTML = helper.padInner$('body').html(); const originalHTML = helper.padInner$('body').html();
makeSureShortcutIsEnabled('cmdShift1'); makeSureShortcutIsEnabled('cmdShift1');
triggerCtrlShiftShortcut('1'); triggerCtrlShiftShortcut('1');
await helper.waitForPromise( await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
() => helper.padInner$('body').html !== originalHTML); });
it('inserts unordered list', function (done) {
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1)
.done(done);
});
}); });
it('inserts unordered list', function (done) { context('and pad shortcut is disabled', function () {
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1).done(done); beforeEach(async function () {
}); const originalHTML = helper.padInner$('body').html();
}); makeSureShortcutIsDisabled('cmdShift1');
triggerCtrlShiftShortcut('1');
await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
});
context('and pad shortcut is disabled', function () { it('does not insert unordered list', function (done) {
beforeEach(async function () { helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1)
const originalHTML = helper.padInner$('body').html(); .done(() => {
makeSureShortcutIsDisabled('cmdShift1'); expect().fail(() => 'Unordered list inserted, should ignore shortcut');
triggerCtrlShiftShortcut('1'); })
await helper.waitForPromise( .fail(() => {
() => helper.padInner$('body').html !== originalHTML); done();
}); });
it('does not insert unordered list', function (done) {
helper.waitFor(
() => helper.padInner$('div').first().find('ol li').length === 1).done(() => {
expect().fail(() => 'Unordered list inserted, should ignore shortcut');
}).fail(() => {
done();
}); });
}); });
}); });
});
xit('issue #1125 keeps the numbered list on enter for the new line', function (done) { xit('issue #1125 keeps the numbered list on enter for the new line', function (done) {
// EMULATES PASTING INTO A PAD // EMULATES PASTING INTO A PAD
const inner$ = helper.padInner$; const inner$ = helper.padInner$;
const chrome$ = helper.padChrome$; const chrome$ = helper.padChrome$;
const $insertorderedlistButton = chrome$('.buttonicon-insertorderedlist'); const $insertorderedlistButton = chrome$('.buttonicon-insertorderedlist');
$insertorderedlistButton.click(); $insertorderedlistButton.click();
// type a bit, make a line break and type again // type a bit, make a line break and type again
const $firstTextElement = inner$('div span').first(); const $firstTextElement = inner$('div span').first();
$firstTextElement.sendkeys('line 1'); $firstTextElement.sendkeys('line 1');
$firstTextElement.sendkeys('{enter}'); $firstTextElement.sendkeys('{enter}');
$firstTextElement.sendkeys('line 2'); $firstTextElement.sendkeys('line 2');
$firstTextElement.sendkeys('{enter}'); $firstTextElement.sendkeys('{enter}');
helper.waitFor(() => inner$('div span').first().text().indexOf('line 2') === -1).done(() => { helper.waitFor(() => inner$('div span').first().text().indexOf('line 2') === -1).done(() => {
const $newSecondLine = inner$('div').first().next(); const $newSecondLine = inner$('div').first().next();
const hasOLElement = $newSecondLine.find('ol li').length === 1; const hasOLElement = $newSecondLine.find('ol li').length === 1;
expect(hasOLElement).to.be(true); expect(hasOLElement).to.be(true);
expect($newSecondLine.text()).to.be('line 2'); expect($newSecondLine.text()).to.be('line 2');
const hasLineNumber = $newSecondLine.find('ol').attr('start') === 2; const hasLineNumber = $newSecondLine.find('ol').attr('start') === 2;
// This doesn't work because pasting in content doesn't work // This doesn't work because pasting in content doesn't work
expect(hasLineNumber).to.be(true); expect(hasLineNumber).to.be(true);
done(); done();
});
}); });
const triggerCtrlShiftShortcut = (shortcutChar) => {
const inner$ = helper.padInner$;
const e = new inner$.Event(helper.evtType);
e.ctrlKey = true;
e.shiftKey = true;
e.which = shortcutChar.toString().charCodeAt(0);
inner$('#innerdocbody').trigger(e);
};
const makeSureShortcutIsDisabled = (shortcut) => {
helper.padChrome$.window.clientVars.padShortcutEnabled[shortcut] = false;
};
const makeSureShortcutIsEnabled = (shortcut) => {
helper.padChrome$.window.clientVars.padShortcutEnabled[shortcut] = true;
};
}); });
const triggerCtrlShiftShortcut = (shortcutChar) => {
const inner$ = helper.padInner$;
const e = new inner$.Event(helper.evtType);
e.ctrlKey = true;
e.shiftKey = true;
e.which = shortcutChar.toString().charCodeAt(0);
inner$('#innerdocbody').trigger(e);
};
const makeSureShortcutIsDisabled = (shortcut) => {
helper.padChrome$.window.clientVars.padShortcutEnabled[shortcut] = false;
};
const makeSureShortcutIsEnabled = (shortcut) => {
helper.padChrome$.window.clientVars.padShortcutEnabled[shortcut] = true;
};
describe('Pressing Tab in an OL increases and decreases indentation', function () { describe('Pressing Tab in an OL increases and decreases indentation', function () {
// create a new pad before each test run // create a new pad before each test run
beforeEach(function (cb) { beforeEach(function (cb) {

18
src/tests/frontend/specs/pad_modal.js
View file

@ -28,7 +28,7 @@ describe('Pad modal', function () {
clickOnPadInner(); clickOnPadInner();
const $modal = helper.padChrome$(MODAL_SELECTOR); const $modal = helper.padChrome$(MODAL_SELECTOR);
const modalIsVisible = $modal.hasClass('popup-show'); const modalIsVisible = $modal.hasClass('popup-show');
helper.waitForPromise(() => $modal.hasClass('popup-show') === true);
expect(modalIsVisible).to.be(true); expect(modalIsVisible).to.be(true);
done(); done();
@ -37,12 +37,10 @@ describe('Pad modal', function () {
context('and user clicks on pad outer', function () { context('and user clicks on pad outer', function () {
it('does not close the modal', function (done) { it('does not close the modal', function (done) {
clickOnPadOuter();
const $modal = helper.padChrome$(MODAL_SELECTOR); const $modal = helper.padChrome$(MODAL_SELECTOR);
const modalIsVisible = $modal.hasClass('popup-show'); const modalIsVisible = $modal.hasClass('popup-show');
clickOnPadOuter();
helper.waitForPromise(() => $modal.hasClass('popup-show') === true);
expect(modalIsVisible).to.be(true); expect(modalIsVisible).to.be(true);
done(); done();
@ -69,20 +67,16 @@ describe('Pad modal', function () {
}); });
*/ */
context('and user clicks on editor', function () { context('and user clicks on editor', function () {
it('closes the modal', function (done) { it('closes the modal', async function () {
clickOnPadInner(); clickOnPadInner();
helper.waitForPromise(() => isModalOpened(MODAL_SELECTOR) === false); await helper.waitForPromise(() => isModalOpened(MODAL_SELECTOR) === false);
expect(isModalOpened(MODAL_SELECTOR)).to.be(false);
done();
}); });
}); });
context('and user clicks on pad outer', function () { context('and user clicks on pad outer', function () {
it('closes the modal', function (done) { it('closes the modal', async function () {
clickOnPadOuter(); clickOnPadOuter();
helper.waitForPromise(() => isModalOpened(MODAL_SELECTOR) === false); await helper.waitForPromise(() => isModalOpened(MODAL_SELECTOR) === false);
expect(isModalOpened(MODAL_SELECTOR)).to.be(false);
done();
}); });
}); });
}); });

42
src/tests/frontend/specs/scrollTo.js
View file

@ -1,25 +1,24 @@
'use strict'; 'use strict';
describe('scrolls to line', function () { describe('scrollTo.js', function () {
// create a new pad with URL hash set before each test run describe('scrolls to line', function () {
before(async function () { // create a new pad with URL hash set before each test run
this.timeout(60000); before(async function () {
await new Promise((resolve, reject) => helper.newPad({ this.timeout(60000);
cb: (err) => { await new Promise((resolve, reject) => helper.newPad({
if (err != null) return reject(err); cb: (err) => (err != null) ? reject(err) : resolve(),
resolve(); hash: 'L4',
}, }));
hash: 'L4', });
}));
});
it('Scrolls down to Line 4', async function () { it('Scrolls down to Line 4', async function () {
this.timeout(10000); this.timeout(10000);
const chrome$ = helper.padChrome$; const chrome$ = helper.padChrome$;
await helper.waitForPromise(() => { await helper.waitForPromise(() => {
const topOffset = parseInt(chrome$('iframe').first('iframe') const topOffset = parseInt(chrome$('iframe').first('iframe')
.contents().find('#outerdocbody').css('top')); .contents().find('#outerdocbody').css('top'));
return (topOffset >= 100); return (topOffset >= 100);
});
}); });
}); });
@ -28,10 +27,7 @@ describe('scrolls to line', function () {
before(async function () { before(async function () {
this.timeout(60000); this.timeout(60000);
await new Promise((resolve, reject) => helper.newPad({ await new Promise((resolve, reject) => helper.newPad({
cb: (err) => { cb: (err) => (err != null) ? reject(err) : resolve(),
if (err != null) return reject(err);
resolve();
},
hash: '#DEEZ123123NUTS', hash: '#DEEZ123123NUTS',
})); }));
}); });

10
src/tests/frontend/specs/select_formatting_buttons.js
View file

@ -39,7 +39,7 @@ describe('select formatting buttons when selection has style applied', function
const originalHTML = helper.padInner$('body').html(); const originalHTML = helper.padInner$('body').html();
const $undoButton = helper.padChrome$('.buttonicon-undo'); const $undoButton = helper.padChrome$('.buttonicon-undo');
$undoButton.click(); $undoButton.click();
await helper.waitFor(() => originalHTML !== helper.padInner$('body').html()); await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
}; };
const testIfFormattingButtonIsDeselected = function (style) { const testIfFormattingButtonIsDeselected = function (style) {
@ -86,7 +86,6 @@ describe('select formatting buttons when selection has style applied', function
const inner$ = helper.padInner$; const inner$ = helper.padInner$;
const originalHTML = helper.padInner$('body').html(); const originalHTML = helper.padInner$('body').html();
helper.waitFor(() => originalHTML !== helper.padInner$('body').html());
// get the first text element out of the inner iframe // get the first text element out of the inner iframe
const $firstTextElement = inner$('div').first(); const $firstTextElement = inner$('div').first();
@ -97,8 +96,7 @@ describe('select formatting buttons when selection has style applied', function
e.ctrlKey = true; // Control key e.ctrlKey = true; // Control key
e.which = key.charCodeAt(0); // I, U, B, 5 e.which = key.charCodeAt(0); // I, U, B, 5
inner$('#innerdocbody').trigger(e); inner$('#innerdocbody').trigger(e);
await helper.waitForPromise( await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
() => originalHTML !== helper.padInner$('body').html());
}; };
STYLES.forEach((style) => { STYLES.forEach((style) => {
@ -130,12 +128,10 @@ describe('select formatting buttons when selection has style applied', function
}); });
context('when user applies a style and the selection does not change', function () { context('when user applies a style and the selection does not change', function () {
const style = STYLES[0]; // italic
it('selects the style button', async function () { it('selects the style button', async function () {
const style = STYLES[0]; // italic
applyStyleOnLine(style, FIRST_LINE); applyStyleOnLine(style, FIRST_LINE);
await helper.waitForPromise(() => isButtonSelected(style) === true); await helper.waitForPromise(() => isButtonSelected(style) === true);
expect(isButtonSelected(style)).to.be(true);
applyStyleOnLine(style, FIRST_LINE); applyStyleOnLine(style, FIRST_LINE);
}); });
}); });

46
src/tests/frontend/specs/unordered_list.js
View file

@ -1,33 +1,35 @@
'use strict'; 'use strict';
describe('assign unordered list', function () { describe('unordered_list.js', function () {
// create a new pad before each test run describe('assign unordered list', function () {
beforeEach(function (cb) { // create a new pad before each test run
helper.newPad(cb); beforeEach(function (cb) {
this.timeout(60000); helper.newPad(cb);
}); this.timeout(60000);
});
it('insert unordered list text then removes by outdent', function (done) { it('insert unordered list text then removes by outdent', function (done) {
const inner$ = helper.padInner$; const inner$ = helper.padInner$;
const chrome$ = helper.padChrome$; const chrome$ = helper.padChrome$;
const originalText = inner$('div').first().text(); const originalText = inner$('div').first().text();
const $insertunorderedlistButton = chrome$('.buttonicon-insertunorderedlist'); const $insertunorderedlistButton = chrome$('.buttonicon-insertunorderedlist');
$insertunorderedlistButton.click(); $insertunorderedlistButton.click();
helper.waitFor(() => {
const newText = inner$('div').first().text();
if (newText === originalText) {
return inner$('div').first().find('ul li').length === 1;
}
}).done(() => {
// remove indentation by bullet and ensure text string remains the same
chrome$('.buttonicon-outdent').click();
helper.waitFor(() => { helper.waitFor(() => {
const newText = inner$('div').first().text(); const newText = inner$('div').first().text();
return (newText === originalText); if (newText === originalText) {
return inner$('div').first().find('ul li').length === 1;
}
}).done(() => { }).done(() => {
done(); // remove indentation by bullet and ensure text string remains the same
chrome$('.buttonicon-outdent').click();
helper.waitFor(() => {
const newText = inner$('div').first().text();
return (newText === originalText);
}).done(() => {
done();
});
}); });
}); });
}); });