mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 02:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

28
tests/frontend/specs/timeslider_revisions.js
View file

@ -26,8 +26,8 @@ describe('timeslider', function () {
setTimeout(() => {
// go to timeslider
$('#iframe-container iframe')
.attr('src', `${$('#iframe-container iframe').attr('src')}/timeslider`);
$('#iframe-container iframe').attr('src',
`${$('#iframe-container iframe').attr('src')}/timeslider`);
setTimeout(() => {
const timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
@ -84,8 +84,8 @@ describe('timeslider', function () {
setTimeout(() => {
// go to timeslider
$('#iframe-container iframe')
.attr('src', `${$('#iframe-container iframe').attr('src')}/timeslider`);
$('#iframe-container iframe').attr('src',
`${$('#iframe-container iframe').attr('src')}/timeslider`);
setTimeout(() => {
const timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
@ -102,15 +102,16 @@ describe('timeslider', function () {
helper.waitFor(
() => $('#iframe-container iframe')[0].contentWindow.location.hash !== oldUrl, 6000)
.always(() => {
expect($('#iframe-container iframe')[0].contentWindow.location.hash)
.not.to.eql(oldUrl);
expect(
$('#iframe-container iframe')[0].contentWindow.location.hash
).not.to.eql(oldUrl);
done();
});
}, 6000);
}, revs * timePerRev);
});
it('jumps to a revision given in the url', function (done) {
this.timeout(6000);
this.timeout(40000);
const inner$ = helper.padInner$;
// wait for the text to be loaded
@ -132,15 +133,16 @@ describe('timeslider', function () {
return lenOkay && colorOkay;
}, 10000).always(() => {
// go to timeslider with a specific revision set
$('#iframe-container iframe')
.attr('src', `${$('#iframe-container iframe').attr('src')}/timeslider#0`);
$('#iframe-container iframe').attr('src',
`${$('#iframe-container iframe').attr('src')}/timeslider#0`);
// wait for the timeslider to be loaded
helper.waitFor(() => {
try {
timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
} catch (e) {
// silently fart. Deadly.
// Empty catch block <3
}
if (timeslider$) {
return timeslider$('#innerdocbody').text().length === oldLength;
@ -161,8 +163,8 @@ describe('timeslider', function () {
setTimeout(() => {
// go to timeslider
$('#iframe-container iframe')
.attr('src', `${$('#iframe-container iframe').attr('src')}/timeslider#0`);
$('#iframe-container iframe').attr('src',
`${$('#iframe-container iframe').attr('src')}/timeslider#0`);
let timeslider$;
let exportLink;
@ -170,7 +172,7 @@ describe('timeslider', function () {
try {
timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
} catch (e) {
// silently give up on life.
// Empty catch block <3
}
if (!timeslider$) return false;
exportLink = timeslider$('#exportplaina').attr('href');