restructure: move bin/ and tests/ to src/

Also add symlinks from the old `bin/` and `tests/` locations to avoid
breaking scripts and other tools.

Motivations:

  * Scripts and tests no longer have to do dubious things like:

        require('ep_etherpad-lite/node_modules/foo')

    to access packages installed as dependencies in
    `src/package.json`.

  * Plugins can access the backend test helper library in a non-hacky
    way:

        require('ep_etherpad-lite/tests/backend/common')

  * We can delete the top-level `package.json` without breaking our
    ability to lint the files in `bin/` and `tests/`.

    Deleting the top-level `package.json` has downsides: It will cause
    `npm` to print warnings whenever plugins are installed, npm will
    no longer be able to enforce a plugin's peer dependency on
    ep_etherpad-lite, and npm will keep deleting the
    `node_modules/ep_etherpad-lite` symlink that points to `../src`.

    But there are significant upsides to deleting the top-level
    `package.json`: It will drastically speed up plugin installation
    because `npm` doesn't have to recursively walk the dependencies in
    `src/package.json`. Also, deleting the top-level `package.json`
    avoids npm's horrible dependency hoisting behavior (where it moves
    stuff from `src/node_modules/` to the top-level `node_modules/`
    directory). Dependency hoisting causes numerous mysterious
    problems such as silent failures in `npm outdated` and `npm
    update`. Dependency hoisting also breaks plugins that do:

        require('ep_etherpad-lite/node_modules/foo')
This commit is contained in:
John McLear 2021-02-03 12:08:43 +00:00 committed by Richard Hansen
parent efde0b787a
commit 2ea8ea1275
146 changed files with 191 additions and 1161 deletions

View file

@ -0,0 +1,329 @@
'use strict';
describe('import functionality', function () {
beforeEach(function (cb) {
helper.newPad(cb); // creates a new pad
this.timeout(60000);
});
function getinnertext() {
const inner = helper.padInner$;
if (!inner) {
return '';
}
let newtext = '';
inner('div').each((line, el) => {
newtext += `${el.innerHTML}\n`;
});
return newtext;
}
function importrequest(data, importurl, type) {
let error;
const result = $.ajax({
url: importurl,
type: 'post',
processData: false,
async: false,
contentType: 'multipart/form-data; boundary=boundary',
accepts: {
text: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
},
data: [
'Content-Type: multipart/form-data; boundary=--boundary',
'',
'--boundary',
`Content-Disposition: form-data; name="file"; filename="import.${type}"`,
'Content-Type: text/plain',
'',
data,
'',
'--boundary',
].join('\r\n'),
error(res) {
error = res;
},
});
expect(error).to.be(undefined);
return result;
}
function exportfunc(link) {
const exportresults = [];
$.ajaxSetup({
async: false,
});
$.get(`${link}/export/html`, (data) => {
const start = data.indexOf('<body>');
const end = data.indexOf('</body>');
const html = data.substr(start + 6, end - start - 6);
exportresults.push(['html', html]);
});
$.get(`${link}/export/txt`, (data) => {
exportresults.push(['txt', data]);
});
return exportresults;
}
xit('import a pad with newlines from txt', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const textWithNewLines = 'imported text\nnewline';
importrequest(textWithNewLines, importurl, 'txt');
helper.waitFor(() => expect(getinnertext())
.to.be('<span class="">imported text</span>\n<span class="">newline</span>\n<br>\n'));
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1]).to.be('imported text<br>newline<br><br>');
expect(results[1][1]).to.be('imported text\nnewline\n\n');
done();
});
xit('import a pad with newlines from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithNewLines = '<html><body>htmltext<br/>newline</body></html>';
importrequest(htmlWithNewLines, importurl, 'html');
helper.waitFor(() => expect(getinnertext())
.to.be('<span class="">htmltext</span>\n<span class="">newline</span>\n<br>\n'));
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1]).to.be('htmltext<br>newline<br><br>');
expect(results[1][1]).to.be('htmltext\nnewline\n\n');
done();
});
xit('import a pad with attributes from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithNewLines = '<html><body>htmltext<br/><span class="b s i u">' +
'<b><i><s><u>newline</u></s></i></b></body></html>';
importrequest(htmlWithNewLines, importurl, 'html');
helper.waitFor(() => expect(getinnertext())
.to.be('<span class="">htmltext</span>\n<span class="b i s u">' +
'<b><i><s><u>newline</u></s></i></b></span>\n<br>\n'));
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1])
.to.be('htmltext<br><strong><em><s><u>newline</u></s></em></strong><br><br>');
expect(results[1][1]).to.be('htmltext\nnewline\n\n');
done();
});
xit('import a pad with bullets from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
'<li>bullet line 2</li><ul class="list-bullet2"><li>bullet2 line 1</li>' +
'<li>bullet2 line 2</li></ul></ul></body></html>';
importrequest(htmlWithBullets, importurl, 'html');
helper.waitFor(() => expect(getinnertext()).to.be(
'<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n' +
'<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
'<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n' +
'<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>\n' +
'<br>\n'));
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1]).to.be(
'<ul class="bullet"><li>bullet line 1</li><li>bullet line 2</li>' +
'<ul class="bullet"><li>bullet2 line 1</li><li>bullet2 line 2</li></ul></ul><br>');
expect(results[1][1])
.to.be('\t* bullet line 1\n\t* bullet line 2\n' +
'\t\t* bullet2 line 1\n\t\t* bullet2 line 2\n\n');
done();
});
xit('import a pad with bullets and newlines from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
'</ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2">' +
'<li>bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1">' +
'<ul class="list-bullet2"><li>bullet2 line 2</li></ul></ul></body></html>';
importrequest(htmlWithBullets, importurl, 'html');
helper.waitFor(() => expect(getinnertext()).to.be(
'<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n' +
'<br>\n' +
'<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
'<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n' +
'<br>\n' +
'<ul class="list-bullet2"><li><span class="">bullet2 line 2</span></li></ul>\n' +
'<br>\n'));
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1]).to.be(
'<ul class="bullet"><li>bullet line 1</li></ul><br><ul class="bullet">' +
'<li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li></ul>' +
'</ul><br><ul><ul class="bullet"><li>bullet2 line 2</li></ul></ul><br>');
expect(results[1][1]).to.be(
'\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t* bullet2 line 2\n\n');
done();
});
xit('import a pad with bullets and newlines and attributes from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
'</ul><br/><ul class="list-bullet1"><li>bullet line 2</li>' +
'<ul class="list-bullet2"><li>bullet2 line 1</li></ul></ul>' +
'<br/><ul class="list-bullet1"><ul class="list-bullet2"><ul class="list-bullet3">' +
'<ul class="list-bullet4"><li><span class="b s i u"><b><i>' +
'<s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li>' +
'<span class="b s "><b><s>bullet4 line 2 bs</s></b></span></li>' +
'<li><span class="u"><u>bullet4 line 2 u</u></span><span class="u i s">' +
'<i><s><u>uis</u></s></i></span></li></ul></ul></ul></ul></body></html>';
importrequest(htmlWithBullets, importurl, 'html');
helper.waitFor(() => expect(getinnertext()).to.be(
'<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n<br>\n' +
'<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
'<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n<br>\n' +
'<ul class="list-bullet4"><li><span class="b i s u">' +
'<b><i><s><u>bullet4 line 2 bisu</u></s></i></b></span></li></ul>\n' +
'<ul class="list-bullet4"><li><span class="b s">' +
'<b><s>bullet4 line 2 bs</s></b></span></li></ul>\n' +
'<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u>' +
'</span><span class="i s u"><i><s><u>uis</u></s></i></span></li></ul>\n' +
'<br>\n'));
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1]).to.be(
'<ul class="bullet"><li>bullet line 1</li></ul>' +
'<br><ul class="bullet"><li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li>' +
'</ul></ul><br><ul><ul><ul><ul class="bullet"><li><strong><em><s><u>bullet4 line 2 bisu' +
'</u></s></em></strong></li><li><strong><s>bullet4 line 2 bs</s></strong>' +
'</li><li><u>bullet4 line 2 u<em><s>uis</s></em></u></li></ul></ul></ul></ul><br>');
expect(results[1][1]).to.be(
'\t* bullet line 1\n\n\t* bullet line 2\n\t\t* bullet2 line 1\n\n\t\t\t\t* bullet4 line 2' +
' bisu\n\t\t\t\t* bullet4 line 2 bs\n\t\t\t\t* bullet4 line 2 uuis\n\n');
done();
});
xit('import a pad with nested bullets from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithBullets = '<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
'</ul><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2">' +
'<li>bullet2 line 1</li></ul></ul><ul class="list-bullet1"><ul class="list-bullet2">' +
'<ul class="list-bullet3"><ul class="list-bullet4"><li>bullet4 line 2</li>' +
'<li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul>' +
'</ul><li>bullet2 line 1</li></ul></body></html>';
importrequest(htmlWithBullets, importurl, 'html');
const oldtext = getinnertext();
helper.waitFor(() => oldtext !== getinnertext()
// return expect(getinnertext()).to.be('\
// <ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n\
// <ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n\
// <ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n\
// <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
// <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
// <ul class="list-bullet4"><li><span class="">bullet4 line 2</span></li></ul>\n\
// <br>\n')
);
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1]).to.be(
'<ul class="bullet"><li>bullet line 1</li><li>bullet line 2</li>' +
'<ul class="bullet"><li>bullet2 line 1</li><ul><ul class="bullet"><li>bullet4 line 2</li>' +
'<li>bullet4 line 2</li><li>bullet4 line 2</li></ul><li>bullet3 line 1</li></ul></ul>' +
'<li>bullet2 line 1</li></ul><br>');
expect(results[1][1]).to.be(
'\t* bullet line 1\n\t* bullet line 2\n\t\t* bullet2 line 1\n\t\t\t\t* bullet4 line 2' +
'\n\t\t\t\t* bullet4 line 2\n\t\t\t\t* bullet4 line 2\n\t\t\t* bullet3 line 1' +
'\n\t* bullet2 line 1\n\n');
done();
});
xit('import with 8 levels of bullets and newlines and attributes from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithBullets =
'<html><body><ul class="list-bullet1"><li>bullet line 1</li>' +
'</ul><br/><ul class="list-bullet1"><li>bullet line 2</li><ul class="list-bullet2"><li>' +
'bullet2 line 1</li></ul></ul><br/><ul class="list-bullet1"><ul class="list-bullet2">' +
'<ul class="list-bullet3"><ul class="list-bullet4"><li><span class="b s i u"><b><i>' +
'<s><u>bullet4 line 2 bisu</u></s></i></b></span></li><li><span class="b s "><b><s>' +
'bullet4 line 2 bs</s></b></span></li><li><span class="u"><u>bullet4 line 2 u' +
'</u></span><span class="u i s"><i><s><u>uis</u></s></i></span></li>' +
'<ul class="list-bullet5"><ul class="list-bullet6"><ul class="list-bullet7">' +
'<ul class="list-bullet8"><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-bullet5">' +
'<li>foobar</li></ul></ul></ul></ul></body></html>';
importrequest(htmlWithBullets, importurl, 'html');
helper.waitFor(() => expect(getinnertext()).to.be(
'<ul class="list-bullet1"><li><span class="">bullet line 1</span></li></ul>\n<br>\n' +
'<ul class="list-bullet1"><li><span class="">bullet line 2</span></li></ul>\n' +
'<ul class="list-bullet2"><li><span class="">bullet2 line 1</span></li></ul>\n<br>\n' +
'<ul class="list-bullet4"><li><span class="b i s u"><b><i><s><u>bullet4 line 2 bisu</u>' +
'</s></i></b></span></li></ul>\n' +
'<ul class="list-bullet4"><li><span class="b s"><b><s>bullet4 line 2 bs</s></b>' +
'</span></li></ul>\n' +
'<ul class="list-bullet4"><li><span class="u"><u>bullet4 line 2 u</u></span>' +
'<span class="i s u"><i><s><u>uis</u></s>' +
'</i></span></li></ul>\n' +
'<ul class="list-bullet8"><li><span class="">foo</span></li></ul>\n' +
'<ul class="list-bullet8"><li><span class="b s"><b><s>foobar bs</s></b>' +
'</span></li></ul>\n' +
'<ul class="list-bullet5"><li><span class="">foobar</span></li></ul>\n' +
'<br>\n'));
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1]).to.be(
'<ul class="bullet"><li>bullet line 1</li></ul><br><ul class="bullet">' +
'<li>bullet line 2</li><ul class="bullet"><li>bullet2 line 1</li></ul></ul>' +
'<br><ul><ul><ul><ul class="bullet"><li><strong><em><s><u>' +
'bullet4 line 2 bisu</u></s></em></strong></li><li><strong><s>' +
'bullet4 line 2 bs</s></strong></li><li><u>bullet4 line 2 u<em>' +
'<s>uis</s></em></u></li><ul><ul><ul><ul class="bullet"><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(
'\t* bullet line 1\n\n\t* bullet line 2\n\t\t* ' +
'bullet2 line 1\n\n\t\t\t\t* bullet4 line 2 bisu\n\t\t\t\t* bullet4 line 2 ' +
'bs\n\t\t\t\t* bullet4 line 2 uuis\n\t\t\t\t\t\t\t\t* foo\n\t\t\t\t\t\t\t\t* ' +
'foobar bs\n\t\t\t\t\t* foobar\n\n');
done();
});
xit('import a pad with ordered lists from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithBullets = '<html><body><ol class="list-number1" start="1">' +
'<li>number 1 line 1</li></ol><ol class="list-number1" start="2">' +
'<li>number 2 line 2</li></ol></body></html>';
importrequest(htmlWithBullets, importurl, 'html');
console.error(getinnertext());
expect(getinnertext()).to.be(
'<ol class="list-number1" start="1"><li><span class="">number 1 line 1</span></li></ol>\n' +
'<ol class="list-number1" start="2"><li><span class="">number 2 line 2</span></li></ol>\n' +
'<br>\n');
const results = exportfunc(helper.padChrome$.window.location.href);
expect(results[0][1]).to.be(
'<ol class="list-number1" start="1"><li>number 1 line 1</li>' +
'</ol><ol class="list-number1" start="2"><li>number 2 line 2</li></ol>');
expect(results[1][1]).to.be('');
done();
});
xit('import a pad with ordered lists and newlines from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithBullets = '<html><body><ol class="list-number1" start="1">' +
'<li>number 9 line 1</li></ol><br/><ol class="list-number1" start="2">' +
'<li>number 10 line 2</li><ol class="list-number2">' +
'<li>number 2 times line 1</li></ol></ol><br/><ol class="list-bullet1">' +
'<ol class="list-number2"><li>number 2 times line 2</li></ol></ol></body></html>';
importrequest(htmlWithBullets, importurl, 'html');
expect(getinnertext()).to.be(
'<ol class="list-number1" start="1"><li><span class="">number 9 line 1</span></li></ol>\n' +
'<br>\n' +
'<ol class="list-number1" start="2"><li><span class="">number 10 line 2</span></li>' +
'</ol>\n' +
'<ol class="list-number2"><li><span class="">number 2 times line 1</span></li></ol>\n' +
'<br>\n' +
'<ol class="list-number2"><li><span class="">number 2 times line 2</span></li></ol>\n' +
'<br>\n');
const results = exportfunc(helper.padChrome$.window.location.href);
console.error(results);
done();
});
xit('import with nested ordered lists and attributes and newlines from html', function (done) {
const importurl = `${helper.padChrome$.window.location.href}/import`;
const htmlWithBullets = '<html><body><ol class="list-number1" start="1"><li>' +
'<span class="b s i u"><b><i><s><u>bold strikethrough italics underline</u>' +
'</s><i/></b></span> line <span class="b"><b>1bold</b></span></li>' +
'</ol><br/><span class="i"><i><ol class="list-number1" start="2">' +
'<li>number 10 line 2</li><ol class="list-number2">' +
'<li>number 2 times line 1</li></ol></ol></i></span><br/>' +
'<ol class="list-bullet1"><ol class="list-number2">' +
'<li>number 2 times line 2</li></ol></ol></body></html>';
importrequest(htmlWithBullets, importurl, 'html');
expect(getinnertext()).to.be(
'<ol class="list-number1"><li><span class="b i s u"><b><i><s><u>' +
'bold strikethrough italics underline</u></s></i></b></span><span class="">' +
' line </span><span class="b"><b>1bold</b></span></li></ol>\n' +
'<br>\n' +
'<ol class="list-number1"><li><span class="i"><i>number 10 line 2</i></span></li></ol>\n' +
'<ol class="list-number2"><li><span class="i">' +
'<i>number 2 times line 1</i></span></li></ol>\n' +
'<br>\n' +
'<ol class="list-number2"><li><span class="">number 2 times line 2</span></li></ol>\n' +
'<br>\n');
const results = exportfunc(helper.padChrome$.window.location.href);
console.error(results);
done();
});
});