mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

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
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 $undoButton = helper.padChrome$('.buttonicon-undo');
$undoButton.click();
await helper.waitForPromise(
() => originalHTML !== helper.padInner$('body').html()
);
await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
});
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 $undoButton = helper.padChrome$('.buttonicon-undo');
$undoButton.click();
await helper.waitForPromise(
() => originalHTML !== helper.padInner$('body').html()
);
await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
});
it('moves text back to its original place', function (done) {

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

@ -1,5 +1,6 @@
'use strict';
describe('ordered_list.js', function () {
describe('assign ordered list', function () {
// create a new pad before each test run
beforeEach(function (cb) {
@ -23,12 +24,12 @@ describe('assign ordered list', function () {
const originalHTML = helper.padInner$('body').html();
makeSureShortcutIsEnabled('cmdShiftN');
triggerCtrlShiftShortcut('N');
await helper.waitForPromise(
() => helper.padInner$('body').html !== originalHTML);
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);
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1)
.done(done);
});
});
@ -37,15 +38,15 @@ describe('assign ordered list', function () {
const originalHTML = helper.padInner$('body').html();
makeSureShortcutIsDisabled('cmdShiftN');
triggerCtrlShiftShortcut('N');
await helper.waitForPromise(
() => helper.padInner$('body').html !== originalHTML);
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(() => {
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1)
.done(() => {
expect().fail(() => 'Unordered list inserted, should ignore shortcut');
}).fail(() => {
})
.fail(() => {
done();
});
});
@ -58,12 +59,12 @@ describe('assign ordered list', function () {
const originalHTML = helper.padInner$('body').html();
makeSureShortcutIsEnabled('cmdShift1');
triggerCtrlShiftShortcut('1');
await helper.waitForPromise(
() => helper.padInner$('body').html !== originalHTML);
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);
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1)
.done(done);
});
});
@ -72,15 +73,15 @@ describe('assign ordered list', function () {
const originalHTML = helper.padInner$('body').html();
makeSureShortcutIsDisabled('cmdShift1');
triggerCtrlShiftShortcut('1');
await helper.waitForPromise(
() => helper.padInner$('body').html !== originalHTML);
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(() => {
helper.waitFor(() => helper.padInner$('div').first().find('ol li').length === 1)
.done(() => {
expect().fail(() => 'Unordered list inserted, should ignore shortcut');
}).fail(() => {
})
.fail(() => {
done();
});
});
@ -129,6 +130,7 @@ describe('assign ordered list', function () {
const makeSureShortcutIsEnabled = (shortcut) => {
helper.padChrome$.window.clientVars.padShortcutEnabled[shortcut] = true;
};
});
describe('Pressing Tab in an OL increases and decreases indentation', function () {
// create a new pad before each test run

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

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

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

@ -1,14 +1,12 @@
'use strict';
describe('scrollTo.js', function () {
describe('scrolls to line', function () {
// create a new pad with URL hash set before each test run
before(async function () {
this.timeout(60000);
await new Promise((resolve, reject) => helper.newPad({
cb: (err) => {
if (err != null) return reject(err);
resolve();
},
cb: (err) => (err != null) ? reject(err) : resolve(),
hash: 'L4',
}));
});
@ -22,16 +20,14 @@ describe('scrolls to line', function () {
return (topOffset >= 100);
});
});
});
describe('doesnt break on weird hash input', function () {
// create a new pad with URL hash set before each test run
before(async function () {
this.timeout(60000);
await new Promise((resolve, reject) => helper.newPad({
cb: (err) => {
if (err != null) return reject(err);
resolve();
},
cb: (err) => (err != null) ? reject(err) : resolve(),
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 $undoButton = helper.padChrome$('.buttonicon-undo');
$undoButton.click();
await helper.waitFor(() => originalHTML !== helper.padInner$('body').html());
await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
};
const testIfFormattingButtonIsDeselected = function (style) {
@ -86,7 +86,6 @@ describe('select formatting buttons when selection has style applied', function
const inner$ = helper.padInner$;
const originalHTML = helper.padInner$('body').html();
helper.waitFor(() => originalHTML !== helper.padInner$('body').html());
// get the first text element out of the inner iframe
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.which = key.charCodeAt(0); // I, U, B, 5
inner$('#innerdocbody').trigger(e);
await helper.waitForPromise(
() => originalHTML !== helper.padInner$('body').html());
await helper.waitForPromise(() => helper.padInner$('body').html() !== originalHTML);
};
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 () {
const style = STYLES[0]; // italic
it('selects the style button', async function () {
const style = STYLES[0]; // italic
applyStyleOnLine(style, FIRST_LINE);
await helper.waitForPromise(() => isButtonSelected(style) === true);
expect(isButtonSelected(style)).to.be(true);
applyStyleOnLine(style, FIRST_LINE);
});
});

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

@ -1,5 +1,6 @@
'use strict';
describe('unordered_list.js', function () {
describe('assign unordered list', function () {
// create a new pad before each test run
beforeEach(function (cb) {
@ -31,6 +32,7 @@ describe('assign unordered list', function () {
});
});
});
});
describe('unassign unordered list', function () {
// create a new pad before each test run