is used for one line in ACE.
- const lenOkay = inner$('body').text().length + newLines / 2 !== oldLength;
- // this waits for the color to be added to our
, which means that the revision
- // was accepted by the server.
- const colorOkay = inner$('span').first().attr('class').indexOf('author-') === 0;
- 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`);
+ const newLines = inner$('body div').length;
+ const oldLength = inner$('body').text().length + newLines / 2;
+ expect(oldLength).to.not.eql(0);
+ inner$('div').first().sendkeys('a');
+ let timeslider$;
- // wait for the timeslider to be loaded
- helper.waitFor(() => {
- try {
- timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
- } catch (e) {
- // Empty catch block <3
- }
- if (timeslider$) {
- return timeslider$('#innerdocbody').text().length === oldLength;
- }
- }, 10000).always(() => {
- expect(timeslider$('#innerdocbody').text().length).to.eql(oldLength);
- done();
- });
- });
- });
+ // wait for our additional revision to be added
+ await helper.waitForPromise(() => {
+ // newLines takes the new lines into account which are strippen when using
+ // inner$('body').text(), one is used for one line in ACE.
+ const lenOkay = inner$('body').text().length + newLines / 2 !== oldLength;
+ // this waits for the color to be added to our , which means that the revision
+ // was accepted by the server.
+ const colorOkay = inner$('span').first().attr('class').indexOf('author-') === 0;
+ return lenOkay && colorOkay;
+ }, 10000);
+
+ // go to timeslider with a specific revision set
+ $('#iframe-container iframe')
+ .attr('src', `${$('#iframe-container iframe').attr('src')}/timeslider#0`);
+
+ // wait for the timeslider to be loaded
+ await helper.waitForPromise(() => {
+ try {
+ timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
+ } catch (e) {
+ // Empty catch block <3
+ }
+ return timeslider$ && timeslider$('#innerdocbody').text().length === oldLength;
+ }, 10000);
});
- it('checks the export url', function (done) {
+ it('checks the export url', async function () {
const inner$ = helper.padInner$;
this.timeout(11000);
inner$('div').first().sendkeys('a');
- setTimeout(() => {
- // go to timeslider
- $('#iframe-container iframe').attr('src',
- `${$('#iframe-container iframe').attr('src')}/timeslider#0`);
- let timeslider$;
- let exportLink;
+ await new Promise((resolve) => setTimeout(resolve, 2500));
- helper.waitFor(() => {
- try {
- timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
- } catch (e) {
- // Empty catch block <3
- }
- if (!timeslider$) return false;
- exportLink = timeslider$('#exportplaina').attr('href');
- if (!exportLink) return false;
- return exportLink.substr(exportLink.length - 12) === '0/export/txt';
- }, 6000).always(() => {
- expect(exportLink.substr(exportLink.length - 12)).to.eql('0/export/txt');
- done();
- });
- }, 2500);
+ // go to timeslider
+ $('#iframe-container iframe')
+ .attr('src', `${$('#iframe-container iframe').attr('src')}/timeslider#0`);
+ let timeslider$;
+ let exportLink;
+
+ await helper.waitForPromise(() => {
+ try {
+ timeslider$ = $('#iframe-container iframe')[0].contentWindow.$;
+ } catch (e) {
+ // Empty catch block <3
+ }
+ if (!timeslider$) return false;
+ exportLink = timeslider$('#exportplaina').attr('href');
+ if (!exportLink) return false;
+ return exportLink.substr(exportLink.length - 12) === '0/export/txt';
+ }, 6000);
});
});
diff --git a/src/tests/frontend/specs/undo.js b/src/tests/frontend/specs/undo.js
index 039ba6903..97adf7aaa 100644
--- a/src/tests/frontend/specs/undo.js
+++ b/src/tests/frontend/specs/undo.js
@@ -1,12 +1,12 @@
'use strict';
describe('undo button', function () {
- beforeEach(function (cb) {
- helper.newPad(cb); // creates a new pad
+ beforeEach(async function () {
this.timeout(60000);
+ await helper.aNewPad();
});
- it('undo some typing by clicking undo button', function (done) {
+ it('undo some typing by clicking undo button', async function () {
this.timeout(100);
this.timeout(150);
const inner$ = helper.padInner$;
@@ -25,14 +25,10 @@ describe('undo button', function () {
// click the button
$undoButton.click();
- helper.waitFor(() => inner$('div span').first().text() === originalValue).done(() => {
- const finalValue = inner$('div span').first().text();
- expect(finalValue).to.be(originalValue); // expect the value to change
- done();
- });
+ await helper.waitForPromise(() => inner$('div span').first().text() === originalValue);
});
- it('undo some typing using a keypress', function (done) {
+ it('undo some typing using a keypress', async function () {
this.timeout(150);
const inner$ = helper.padInner$;
@@ -49,10 +45,6 @@ describe('undo button', function () {
e.which = 90; // z
inner$('#innerdocbody').trigger(e);
- helper.waitFor(() => inner$('div span').first().text() === originalValue).done(() => {
- const finalValue = inner$('div span').first().text();
- expect(finalValue).to.be(originalValue); // expect the value to change
- done();
- });
+ await helper.waitForPromise(() => inner$('div span').first().text() === originalValue);
});
});
diff --git a/src/tests/frontend/specs/unordered_list.js b/src/tests/frontend/specs/unordered_list.js
index f82b620c9..f4c34b376 100644
--- a/src/tests/frontend/specs/unordered_list.js
+++ b/src/tests/frontend/specs/unordered_list.js
@@ -3,12 +3,12 @@
describe('unordered_list.js', function () {
describe('assign unordered list', function () {
// create a new pad before each test run
- beforeEach(function (cb) {
- helper.newPad(cb);
+ beforeEach(async function () {
this.timeout(60000);
+ await helper.aNewPad();
});
- it('insert unordered list text then removes by outdent', function (done) {
+ it('insert unordered list text then removes by outdent', async function () {
this.timeout(150);
const inner$ = helper.padInner$;
const chrome$ = helper.padChrome$;
@@ -17,32 +17,25 @@ describe('unordered_list.js', function () {
const $insertunorderedlistButton = chrome$('.buttonicon-insertunorderedlist');
$insertunorderedlistButton.click();
- helper.waitFor(() => {
+ await helper.waitForPromise(() => {
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(() => {
- const newText = inner$('div').first().text();
- return (newText === originalText);
- }).done(() => {
- done();
- });
+ return newText === originalText && inner$('div').first().find('ul li').length === 1;
});
+
+ // remove indentation by bullet and ensure text string remains the same
+ chrome$('.buttonicon-outdent').click();
+ await helper.waitForPromise(() => inner$('div').first().text() === originalText);
});
});
describe('unassign unordered list', function () {
// create a new pad before each test run
- beforeEach(function (cb) {
- helper.newPad(cb);
+ beforeEach(async function () {
this.timeout(60000);
+ await helper.aNewPad();
});
- it('insert unordered list text then remove by clicking list again', function (done) {
+ it('insert unordered list text then remove by clicking list again', async function () {
this.timeout(150);
const inner$ = helper.padInner$;
const chrome$ = helper.padChrome$;
@@ -51,34 +44,26 @@ describe('unordered_list.js', function () {
const $insertunorderedlistButton = chrome$('.buttonicon-insertunorderedlist');
$insertunorderedlistButton.click();
- helper.waitFor(() => {
+ await helper.waitForPromise(() => {
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
- $insertunorderedlistButton.click();
- helper.waitFor(() => {
- const isList = inner$('div').find('ul').length === 1;
- // sohuldn't be list
- return (isList === false);
- }).done(() => {
- done();
- });
+ return newText === originalText && inner$('div').first().find('ul li').length === 1;
});
+
+ // remove indentation by bullet and ensure text string remains the same
+ $insertunorderedlistButton.click();
+ await helper.waitForPromise(() => inner$('div').find('ul').length !== 1);
});
});
describe('keep unordered list on enter key', function () {
// create a new pad before each test run
- beforeEach(function (cb) {
- helper.newPad(cb);
+ beforeEach(async function () {
this.timeout(60000);
+ await helper.aNewPad();
});
- it('Keeps the unordered list on enter for the new line', function (done) {
+ it('Keeps the unordered list on enter for the new line', async function () {
this.timeout(250);
const inner$ = helper.padInner$;
const chrome$ = helper.padChrome$;
@@ -93,24 +78,23 @@ describe('unordered_list.js', function () {
$firstTextElement.sendkeys('line 2');
$firstTextElement.sendkeys('{enter}');
- helper.waitFor(() => inner$('div span').first().text().indexOf('line 2') === -1).done(() => {
- const $newSecondLine = inner$('div').first().next();
- const hasULElement = $newSecondLine.find('ul li').length === 1;
- expect(hasULElement).to.be(true);
- expect($newSecondLine.text()).to.be('line 2');
- done();
- });
+ await helper.waitForPromise(() => inner$('div span').first().text().indexOf('line 2') === -1);
+
+ const $newSecondLine = inner$('div').first().next();
+ const hasULElement = $newSecondLine.find('ul li').length === 1;
+ expect(hasULElement).to.be(true);
+ expect($newSecondLine.text()).to.be('line 2');
});
});
describe('Pressing Tab in an UL increases and decreases indentation', function () {
// create a new pad before each test run
- beforeEach(function (cb) {
- helper.newPad(cb);
+ beforeEach(async function () {
this.timeout(60000);
+ await helper.aNewPad();
});
- it('indent and de-indent list item with keypress', function (done) {
+ it('indent and de-indent list item with keypress', async function () {
this.timeout(150);
const inner$ = helper.padInner$;
const chrome$ = helper.padChrome$;
@@ -133,19 +117,19 @@ describe('unordered_list.js', function () {
e.keyCode = 9; // tab
inner$('#innerdocbody').trigger(e);
- helper.waitFor(() => inner$('div').first().find('.list-bullet1').length === 1).done(done);
+ await helper.waitForPromise(() => inner$('div').first().find('.list-bullet1').length === 1);
});
});
describe('Pressing indent/outdent button in an UL increases and decreases indentation ' +
'and bullet / ol formatting', function () {
// create a new pad before each test run
- beforeEach(function (cb) {
- helper.newPad(cb);
+ beforeEach(async function () {
this.timeout(60000);
+ await helper.aNewPad();
});
- it('indent and de-indent list item with indent button', function (done) {
+ it('indent and de-indent list item with indent button', async function () {
this.timeout(150);
const inner$ = helper.padInner$;
const chrome$ = helper.padChrome$;
@@ -166,7 +150,7 @@ describe('unordered_list.js', function () {
const $outdentButton = chrome$('.buttonicon-outdent');
$outdentButton.click(); // make it deindented to 1
- helper.waitFor(() => inner$('div').first().find('.list-bullet1').length === 1).done(done);
+ await helper.waitForPromise(() => inner$('div').first().find('.list-bullet1').length === 1);
});
});
});
diff --git a/src/tests/frontend/specs/urls_become_clickable.js b/src/tests/frontend/specs/urls_become_clickable.js
index 8a038b8b1..e2a4e14c3 100644
--- a/src/tests/frontend/specs/urls_become_clickable.js
+++ b/src/tests/frontend/specs/urls_become_clickable.js
@@ -7,10 +7,7 @@ describe('urls', function () {
before(async function () {
this.timeout(60000);
- await new Promise((resolve, reject) => helper.newPad((err) => {
- if (err != null) return reject(err);
- resolve();
- }));
+ await helper.aNewPad();
});
beforeEach(async function () {
diff --git a/src/tests/frontend/specs/xxauto_reconnect.js b/src/tests/frontend/specs/xxauto_reconnect.js
index af35e528e..97b8bdcaa 100644
--- a/src/tests/frontend/specs/xxauto_reconnect.js
+++ b/src/tests/frontend/specs/xxauto_reconnect.js
@@ -3,34 +3,31 @@
describe('Automatic pad reload on Force Reconnect message', function () {
let padId, $originalPadFrame;
- beforeEach(function (done) {
- padId = helper.newPad(() => {
- // enable userdup error to have timer to force reconnect
- const $errorMessageModal = helper.padChrome$('#connectivity .userdup');
- $errorMessageModal.addClass('with_reconnect_timer');
-
- // make sure there's a timeout set, otherwise automatic reconnect won't be enabled
- helper.padChrome$.window.clientVars.automaticReconnectionTimeout = 2;
-
- // open same pad on another iframe, to force userdup error
- const $otherIframeWithSamePad = $(``);
- $originalPadFrame = $('#iframe-container iframe');
- $otherIframeWithSamePad.insertAfter($originalPadFrame);
-
- // wait for modal to be displayed
- helper.waitFor(() => $errorMessageModal.is(':visible'), 50000).done(done);
- });
-
+ beforeEach(async function () {
this.timeout(60000);
+ padId = await helper.aNewPad();
+
+ // enable userdup error to have timer to force reconnect
+ const $errorMessageModal = helper.padChrome$('#connectivity .userdup');
+ $errorMessageModal.addClass('with_reconnect_timer');
+
+ // make sure there's a timeout set, otherwise automatic reconnect won't be enabled
+ helper.padChrome$.window.clientVars.automaticReconnectionTimeout = 2;
+
+ // open same pad on another iframe, to force userdup error
+ const $otherIframeWithSamePad = $(``);
+ $originalPadFrame = $('#iframe-container iframe');
+ $otherIframeWithSamePad.insertAfter($originalPadFrame);
+
+ // wait for modal to be displayed
+ await helper.waitForPromise(() => $errorMessageModal.is(':visible'), 50000);
});
- it('displays a count down timer to automatically reconnect', function (done) {
+ it('displays a count down timer to automatically reconnect', async function () {
const $errorMessageModal = helper.padChrome$('#connectivity .userdup');
const $countDownTimer = $errorMessageModal.find('.reconnecttimer');
expect($countDownTimer.is(':visible')).to.be(true);
-
- done();
});
context('and user clicks on Cancel', function () {
@@ -41,31 +38,20 @@ describe('Automatic pad reload on Force Reconnect message', function () {
() => helper.padChrome$('#connectivity .userdup').is(':visible') === true);
});
- it('does not show Cancel button nor timer anymore', function (done) {
+ it('does not show Cancel button nor timer anymore', async function () {
const $errorMessageModal = helper.padChrome$('#connectivity .userdup');
const $countDownTimer = $errorMessageModal.find('.reconnecttimer');
const $cancelButton = $errorMessageModal.find('#cancelreconnect');
expect($countDownTimer.is(':visible')).to.be(false);
expect($cancelButton.is(':visible')).to.be(false);
-
- done();
});
});
context('and user does not click on Cancel until timer expires', function () {
- let padWasReloaded = false;
-
- beforeEach(async function () {
- $originalPadFrame.one('load', () => {
- padWasReloaded = true;
- });
- });
-
- it('reloads the pad', function (done) {
- helper.waitFor(() => padWasReloaded, 10000).done(done);
-
+ it('reloads the pad', async function () {
this.timeout(10000);
+ await new Promise((resolve) => $originalPadFrame.one('load', resolve));
});
});
});