mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-06-20 05:04:51 -04:00
tests: Refine frontend tests
* Switch from `helper.newPad()` to `helper.aNewPad()`. * Promisify. * Delete redundant logic. * Lint fixes.
This commit is contained in:
parent
3790c0e41c
commit
bbf89dfcf9
35 changed files with 697 additions and 842 deletions
|
@ -1,20 +1,21 @@
|
|||
'use strict';
|
||||
|
||||
describe('import indents functionality', function () {
|
||||
beforeEach(function (cb) {
|
||||
helper.newPad(cb); // creates a new pad
|
||||
beforeEach(async function () {
|
||||
this.timeout(60000);
|
||||
await helper.aNewPad();
|
||||
});
|
||||
|
||||
function getinnertext() {
|
||||
const getinnertext = () => {
|
||||
const inner = helper.padInner$;
|
||||
let newtext = '';
|
||||
inner('div').each((line, el) => {
|
||||
newtext += `${el.innerHTML}\n`;
|
||||
});
|
||||
return newtext;
|
||||
}
|
||||
function importrequest(data, importurl, type) {
|
||||
};
|
||||
|
||||
const importrequest = (data, importurl, type) => {
|
||||
let error;
|
||||
const result = $.ajax({
|
||||
url: importurl,
|
||||
|
@ -42,8 +43,9 @@ describe('import indents functionality', function () {
|
|||
});
|
||||
expect(error).to.be(undefined);
|
||||
return result;
|
||||
}
|
||||
function exportfunc(link) {
|
||||
};
|
||||
|
||||
const exportfunc = (link) => {
|
||||
const exportresults = [];
|
||||
$.ajaxSetup({
|
||||
async: false,
|
||||
|
@ -58,51 +60,72 @@ describe('import indents functionality', function () {
|
|||
exportresults.push(['txt', data]);
|
||||
});
|
||||
return exportresults;
|
||||
}
|
||||
};
|
||||
|
||||
xit('import a pad with indents from html', function (done) {
|
||||
xit('import a pad with indents from html', async function () {
|
||||
const importurl = `${helper.padChrome$.window.location.href}/import`;
|
||||
/* eslint-disable-next-line max-len */
|
||||
const htmlWithIndents = '<html><body><ul class="list-indent1"><li>indent line 1</li><li>indent line 2</li><ul class="list-indent2"><li>indent2 line 1</li><li>indent2 line 2</li></ul></ul></body></html>';
|
||||
const htmlWithIndents =
|
||||
'<html><body><ul class="list-indent1"><li>indent line 1</li><li>indent line 2</li>' +
|
||||
'<ul class="list-indent2"><li>indent2 line 1</li><li>indent2 line 2</li></ul></ul>' +
|
||||
'</body></html>';
|
||||
importrequest(htmlWithIndents, importurl, 'html');
|
||||
helper.waitFor(() => expect(getinnertext()).to.be(
|
||||
await helper.waitForPromise(() => getinnertext() ===
|
||||
'<ul class="list-indent1"><li><span class="">indent line 1</span></li></ul>\n' +
|
||||
'<ul class="list-indent1"><li><span class="">indent line 2</span></li></ul>\n' +
|
||||
'<ul class="list-indent2"><li><span class="">indent2 line 1</span></li></ul>\n' +
|
||||
'<ul class="list-indent2"><li><span class="">indent2 line 2</span></li></ul>\n' +
|
||||
'<br>\n'));
|
||||
'<br>\n');
|
||||
const results = exportfunc(helper.padChrome$.window.location.href);
|
||||
/* eslint-disable-next-line max-len */
|
||||
expect(results[0][1]).to.be('<ul class="indent"><li>indent line 1</li><li>indent line 2</li><ul class="indent"><li>indent2 line 1</li><li>indent2 line 2</li></ul></ul><br>');
|
||||
expect(results[0][1]).to.be(
|
||||
'<ul class="indent"><li>indent line 1</li><li>indent line 2</li>' +
|
||||
'<ul class="indent"><li>indent2 line 1</li><li>indent2 line 2</li></ul></ul><br>');
|
||||
expect(results[1][1])
|
||||
.to.be('\tindent line 1\n\tindent line 2\n\t\tindent2 line 1\n\t\tindent2 line 2\n\n');
|
||||
done();
|
||||
});
|
||||
|
||||
xit('import a pad with indented lists and newlines from html', function (done) {
|
||||
xit('import a pad with indented lists and newlines from html', async function () {
|
||||
const importurl = `${helper.padChrome$.window.location.href}/import`;
|
||||
/* eslint-disable-next-line max-len */
|
||||
const htmlWithIndents = '<html><body><ul class="list-indent1"><li>indent line 1</li></ul><br/><ul class="list-indent1"><li>indent 1 line 2</li><ul class="list-indent2"><li>indent 2 times line 1</li></ul></ul><br/><ul class="list-indent1"><ul class="list-indent2"><li>indent 2 times line 2</li></ul></ul></body></html>';
|
||||
const htmlWithIndents =
|
||||
'<html><body><ul class="list-indent1"><li>indent line 1</li></ul><br/>' +
|
||||
'<ul class="list-indent1"><li>indent 1 line 2</li>' +
|
||||
'<ul class="list-indent2"><li>indent 2 times line 1</li></ul></ul><br/>' +
|
||||
'<ul class="list-indent1"><ul class="list-indent2"><li>indent 2 times line 2</li>' +
|
||||
'</ul></ul></body></html>';
|
||||
importrequest(htmlWithIndents, importurl, 'html');
|
||||
helper.waitFor(() => expect(getinnertext()).to.be(
|
||||
await helper.waitForPromise(() => getinnertext() ===
|
||||
'<ul class="list-indent1"><li><span class="">indent line 1</span></li></ul>\n' +
|
||||
'<br>\n' +
|
||||
'<ul class="list-indent1"><li><span class="">indent 1 line 2</span></li></ul>\n' +
|
||||
'<ul class="list-indent2"><li><span class="">indent 2 times line 1</span></li></ul>\n' +
|
||||
'<br>\n' +
|
||||
'<ul class="list-indent2"><li><span class="">indent 2 times line 2</span></li></ul>\n' +
|
||||
'<br>\n'));
|
||||
'<br>\n');
|
||||
const results = exportfunc(helper.padChrome$.window.location.href);
|
||||
/* eslint-disable-next-line max-len */
|
||||
expect(results[0][1]).to.be('<ul class="indent"><li>indent line 1</li></ul><br><ul class="indent"><li>indent 1 line 2</li><ul class="indent"><li>indent 2 times line 1</li></ul></ul><br><ul><ul class="indent"><li>indent 2 times line 2</li></ul></ul><br>');
|
||||
/* eslint-disable-next-line max-len */
|
||||
expect(results[1][1]).to.be('\tindent line 1\n\n\tindent 1 line 2\n\t\tindent 2 times line 1\n\n\t\tindent 2 times line 2\n\n');
|
||||
done();
|
||||
expect(results[0][1]).to.be(
|
||||
'<ul class="indent"><li>indent line 1</li></ul><br>' +
|
||||
'<ul class="indent"><li>indent 1 line 2</li>' +
|
||||
'<ul class="indent"><li>indent 2 times line 1</li></ul></ul><br>' +
|
||||
'<ul><ul class="indent"><li>indent 2 times line 2</li></ul></ul><br>');
|
||||
expect(results[1][1]).to.be(
|
||||
'\tindent line 1\n\n\tindent 1 line 2\n\t\tindent 2 times line 1\n\n' +
|
||||
'\t\tindent 2 times line 2\n\n');
|
||||
});
|
||||
xit('import with 8 levels of indents and newlines and attributes from html', function (done) {
|
||||
|
||||
xit('import with 8 levels of indents and newlines and attributes from html', async function () {
|
||||
const importurl = `${helper.padChrome$.window.location.href}/import`;
|
||||
/* eslint-disable-next-line max-len */
|
||||
const htmlWithIndents = '<html><body><ul class="list-indent1"><li>indent line 1</li></ul><br/><ul class="list-indent1"><li>indent line 2</li><ul class="list-indent2"><li>indent2 line 1</li></ul></ul><br/><ul class="list-indent1"><ul class="list-indent2"><ul class="list-indent3"><ul class="list-indent4"><li><span class="b s i u"><b><i><s><u>indent4 line 2 bisu</u></s></i></b></span></li><li><span class="b s "><b><s>indent4 line 2 bs</s></b></span></li><li><span class="u"><u>indent4 line 2 u</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li><ul class="list-indent5"><ul class="list-indent6"><ul class="list-indent7"><ul class="list-indent8"><li><span class="">foo</span></li><li><span class="b s"><b><s>foobar bs</b></s></span></li></ul></ul></ul></ul><ul class="list-indent5"><li>foobar</li></ul></ul></ul></ul></body></html>';
|
||||
const htmlWithIndents =
|
||||
'<html><body><ul class="list-indent1"><li>indent line 1</li></ul><br/>' +
|
||||
'<ul class="list-indent1"><li>indent line 2</li>' +
|
||||
'<ul class="list-indent2"><li>indent2 line 1</li></ul></ul><br/>' +
|
||||
'<ul class="list-indent1"><ul class="list-indent2"><ul class="list-indent3">' +
|
||||
'<ul class="list-indent4"><li><span class="b s i u"><b><i><s>' +
|
||||
'<u>indent4 line 2 bisu</u></s></i></b></span></li><li><span class="b s ">' +
|
||||
'<b><s>indent4 line 2 bs</s></b></span></li><li><span class="u">' +
|
||||
'<u>indent4 line 2 u</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li>' +
|
||||
'<ul class="list-indent5"><ul class="list-indent6"><ul class="list-indent7">' +
|
||||
'<ul class="list-indent8"><li><span class="">foo</span></li><li><span class="b s">' +
|
||||
'<b><s>foobar bs</b></s></span></li></ul></ul></ul></ul><ul class="list-indent5">' +
|
||||
'<li>foobar</li></ul></ul></ul></ul></body></html>';
|
||||
importrequest(htmlWithIndents, importurl, 'html');
|
||||
helper.waitFor(() => expect(getinnertext()).to.be(
|
||||
'<ul class="list-indent1"><li><span class="">indent line 1</span></li></ul>\n<br>\n' +
|
||||
|
@ -120,10 +143,17 @@ describe('import indents functionality', function () {
|
|||
'<ul class="list-indent5"><li><span class="">foobar</span></li></ul>\n' +
|
||||
'<br>\n'));
|
||||
const results = exportfunc(helper.padChrome$.window.location.href);
|
||||
/* eslint-disable-next-line max-len */
|
||||
expect(results[0][1]).to.be('<ul class="indent"><li>indent line 1</li></ul><br><ul class="indent"><li>indent line 2</li><ul class="indent"><li>indent2 line 1</li></ul></ul><br><ul><ul><ul><ul class="indent"><li><strong><em><s><u>indent4 line 2 bisu</u></s></em></strong></li><li><strong><s>indent4 line 2 bs</s></strong></li><li><u>indent4 line 2 u<em><s>uis</s></em></u></li><ul><ul><ul><ul class="indent"><li>foo</li><li><strong><s>foobar bs</s></strong></li></ul></ul></ul><li>foobar</li></ul></ul></ul></ul></ul><br>');
|
||||
/* eslint-disable-next-line max-len */
|
||||
expect(results[1][1]).to.be('\tindent line 1\n\n\tindent line 2\n\t\tindent2 line 1\n\n\t\t\t\tindent4 line 2 bisu\n\t\t\t\tindent4 line 2 bs\n\t\t\t\tindent4 line 2 uuis\n\t\t\t\t\t\t\t\tfoo\n\t\t\t\t\t\t\t\tfoobar bs\n\t\t\t\t\tfoobar\n\n');
|
||||
done();
|
||||
expect(results[0][1]).to.be(
|
||||
'<ul class="indent"><li>indent line 1</li></ul><br><ul class="indent">' +
|
||||
'<li>indent line 2</li><ul class="indent"><li>indent2 line 1</li></ul></ul><br>' +
|
||||
'<ul><ul><ul><ul class="indent"><li><strong><em><s><u>indent4 line 2 bisu</u></s>' +
|
||||
'</em></strong></li><li><strong><s>indent4 line 2 bs</s></strong></li><li>' +
|
||||
'<u>indent4 line 2 u<em><s>uis</s></em></u></li><ul><ul><ul><ul class="indent">' +
|
||||
'<li>foo</li><li><strong><s>foobar bs</s></strong></li></ul></ul></ul><li>foobar</li>' +
|
||||
'</ul></ul></ul></ul></ul><br>');
|
||||
expect(results[1][1]).to.be(
|
||||
'\tindent line 1\n\n\tindent line 2\n\t\tindent2 line 1\n\n\t\t\t\tindent4 line 2 bisu\n' +
|
||||
'\t\t\t\tindent4 line 2 bs\n\t\t\t\tindent4 line 2 uuis\n\t\t\t\t\t\t\t\tfoo\n' +
|
||||
'\t\t\t\t\t\t\t\tfoobar bs\n\t\t\t\t\tfoobar\n\n');
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue