mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 09:26:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

lint: Run eslint --fix on bin/ and tests/

Browse source
This commit is contained in:
Richard Hansen 2020-11-23 13:21:51 -05:00 • committed by John McLear
parent 0625739cb8
commit b8d07a42eb
78 changed files with 4319 additions and 4599 deletions
Download patch file Download diff file Expand all files Collapse all files

90
tests/frontend/specs/timeslider_follow.js
View file

@ -1,32 +1,32 @@
describe("timeslider follow", function(){
//create a new pad before each test run
beforeEach(function(cb){
describe('timeslider follow', function () {
// create a new pad before each test run
beforeEach(function (cb) {
helper.newPad(cb);
});
it("content as it's added to timeslider", async function() {
it("content as it's added to timeslider", async function () {
// send 6 revisions
let revs = 6;
let message = 'a\n\n\n\n\n\n\n\n\n\n';
let newLines = message.split('\n').length
for (let i=0;i<revs;i++){
await helper.edit(message, newLines*i + 1);
const revs = 6;
const message = 'a\n\n\n\n\n\n\n\n\n\n';
const newLines = message.split('\n').length;
for (let i = 0; i < revs; i++) {
await helper.edit(message, newLines * i + 1);
}
await helper.gotoTimeslider(0);
await helper.waitForPromise(function(){return helper.contentWindow().location.hash === '#0'})
await helper.waitForPromise(() => helper.contentWindow().location.hash === '#0');
let originalTop = helper.contentWindow().$('#innerdocbody').offset();
const originalTop = helper.contentWindow().$('#innerdocbody').offset();
// set to follow contents as it arrives
helper.contentWindow().$('#options-followContents').prop("checked", true);
helper.contentWindow().$('#options-followContents').prop('checked', true);
helper.contentWindow().$('#playpause_button_icon').click();
let newTop;
return helper.waitForPromise(function(){
return helper.waitForPromise(() => {
newTop = helper.contentWindow().$('#innerdocbody').offset();
return newTop.top < originalTop.top;
})
});
});
/**
@ -35,31 +35,28 @@ describe("timeslider follow", function(){
* the change is applied.
*
*/
it("only to lines that exist in the current pad view, see #4389", async function(){
it('only to lines that exist in the current pad view, see #4389', async function () {
// Select everything and clear via delete key
let e = helper.padInner$.Event(helper.evtType);
e.keyCode = 8; //delete key
let lines = helper.linesDiv();
const e = helper.padInner$.Event(helper.evtType);
e.keyCode = 8; // delete key
const lines = helper.linesDiv();
helper.selectLines(lines[0], lines[lines.length - 1]); // select all lines
// probably unnecessary, but wait for the selection to be Range not Caret
await helper.waitForPromise(function(){
return !helper.padInner$.document.getSelection().isCollapsed;
//only supported in FF57+
//return helper.padInner$.document.getSelection().type === 'Range';
})
await helper.waitForPromise(() => !helper.padInner$.document.getSelection().isCollapsed,
// only supported in FF57+
// return helper.padInner$.document.getSelection().type === 'Range';
);
helper.padInner$('#innerdocbody').trigger(e);
await helper.waitForPromise(function(){
return helper.commits.length === 1;
})
await helper.edit("Test line\n\n")
await helper.edit("Another test line", 3)
await helper.waitForPromise(() => helper.commits.length === 1);
await helper.edit('Test line\n\n');
await helper.edit('Another test line', 3);
await helper.gotoTimeslider();
// set to follow contents as it arrives
helper.contentWindow().$('#options-followContents').prop("checked", true);
helper.contentWindow().$('#options-followContents').prop('checked', true);
let oldYPosition = helper.contentWindow().$("#editorcontainerbox")[0].scrollTop;
const oldYPosition = helper.contentWindow().$('#editorcontainerbox')[0].scrollTop;
expect(oldYPosition).to.be(0);
/**
@ -71,50 +68,37 @@ describe("timeslider follow", function(){
// line 3 changed
helper.contentWindow().$('#leftstep').click();
await helper.waitForPromise(function(){
return hasFollowedToLine(3);
})
await helper.waitForPromise(() => hasFollowedToLine(3));
// line 1 is the first line that changed
helper.contentWindow().$('#leftstep').click();
await helper.waitForPromise(function(){
return hasFollowedToLine(1);
})
await helper.waitForPromise(() => hasFollowedToLine(1));
// line 1 changed
helper.contentWindow().$('#leftstep').click();
await helper.waitForPromise(function(){
return hasFollowedToLine(1);
})
await helper.waitForPromise(() => hasFollowedToLine(1));
// line 1 changed
helper.contentWindow().$('#rightstep').click();
await helper.waitForPromise(function(){
return hasFollowedToLine(1);
})
await helper.waitForPromise(() => hasFollowedToLine(1));
// line 1 is the first line that changed
helper.contentWindow().$('#rightstep').click();
await helper.waitForPromise(function(){
return hasFollowedToLine(1);
})
await helper.waitForPromise(() => hasFollowedToLine(1));
// line 3 changed
helper.contentWindow().$('#rightstep').click();
return helper.waitForPromise(function(){
return hasFollowedToLine(3);
})
})
return helper.waitForPromise(() => hasFollowedToLine(3));
});
});
/**
* @param {number} lineNum
* @param {number} lineNum
* @returns {boolean} scrolled to the lineOffset?
*/
function hasFollowedToLine(lineNum) {
let scrollPosition = helper.contentWindow().$("#editorcontainerbox")[0].scrollTop;
let lineOffset = helper.contentWindow().$('#innerdocbody').find(`div:nth-child(${lineNum})`)[0].offsetTop;
const scrollPosition = helper.contentWindow().$('#editorcontainerbox')[0].scrollTop;
const lineOffset = helper.contentWindow().$('#innerdocbody').find(`div:nth-child(${lineNum})`)[0].offsetTop;
return Math.abs(scrollPosition - lineOffset) < 1;
}