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

basic test and hacked in stuff

Browse source
This commit is contained in:
John McLear 2021-01-12 20:21:55 +00:00
parent 62906d72a2
commit e39e959347
2 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/static/js/contentcollector.js
View file

@ -76,6 +76,7 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
p: 1, p: 1,
pre: 1, pre: 1,
li: 1, li: 1,
img: 1,
}; };
_.each(hooks.callAll('ccRegisterBlockElements'), (element) => { _.each(hooks.callAll('ccRegisterBlockElements'), (element) => {
@ -421,12 +422,10 @@ function makeContentCollector(collectStyles, abrowser, apool, domInterface, clas
cls, cls,
node, node,
}); });
} else { // cc.doAttrib(state, 'image:foo.png');
// THIS SEEMS VERY HACKY! -- Please submit a better fix! state.lineAttributes.img = 'foo.png';
delete state.lineAttributes.img;
}
if (tname == 'br') { } else if (tname == 'br') {
this.breakLine = true; this.breakLine = true;
const tvalue = dom.nodeAttr(node, 'value'); const tvalue = dom.nodeAttr(node, 'value');
const induceLineBreak = hooks.callAll('collectContentLineBreak', { const induceLineBreak = hooks.callAll('collectContentLineBreak', {

12
tests/backend/specs/contentcollector.js
View file

@ -15,6 +15,13 @@ const AttributePool = require('../../../src/static/js/AttributePool');
const cheerio = require('../../../src/node_modules/cheerio'); const cheerio = require('../../../src/node_modules/cheerio');
const tests = { const tests = {
image: {
description: 'Puts an image in the content',
html: '<html><body><p>image</p><img src="fooo.png"></body></html>',
expectedLineAttribs: ['+5', '*0*1*2+1'],
expectedText: ['image', '*'],
},
/*
nestedLi: { nestedLi: {
description: 'Complex nested Li', description: 'Complex nested Li',
html: '<!doctype html><html><body><ol><li>one</li><li><ol><li>1.1</li></ol></li><li>two</li></ol></body></html>', html: '<!doctype html><html><body><ol><li>one</li><li><ol><li>1.1</li></ol></li><li>two</li></ol></body></html>',
@ -271,6 +278,7 @@ pre
expectedLineAttribs: ['+f*0+2+2'], expectedLineAttribs: ['+f*0+2+2'],
expectedText: ['Need more space s !'] expectedText: ['Need more space s !']
}, },
*/
}; };
describe(__filename, function () { describe(__filename, function () {
@ -300,7 +308,7 @@ describe(__filename, function () {
// Check recieved text matches the expected text // Check recieved text matches the expected text
if (arraysEqual(recievedText[0], expectedText)) { if (arraysEqual(recievedText[0], expectedText)) {
// console.log("PASS: Recieved Text did match Expected Text\nRecieved:", recievedText[0], "\nExpected:", testObj.expectedText) console.log("PASS: Recieved Text did match Expected Text\nRecieved:", recievedText[0], "\nExpected:", testObj.expectedText)
} else { } else {
console.error('FAIL: Recieved Text did not match Expected Text\nRecieved:', recievedText[0], '\nExpected:', testObj.expectedText); console.error('FAIL: Recieved Text did not match Expected Text\nRecieved:', recievedText[0], '\nExpected:', testObj.expectedText);
throw new Error(); throw new Error();
@ -308,7 +316,7 @@ describe(__filename, function () {
// Check recieved attributes matches the expected attributes // Check recieved attributes matches the expected attributes
if (arraysEqual(recievedAttributes, expectedAttributes)) { if (arraysEqual(recievedAttributes, expectedAttributes)) {
// console.log("PASS: Recieved Attributes matched Expected Attributes"); console.log("PASS: Recieved Attributes matched Expected Attributes", recievedAttributes, expectedAttributes);
done(); done();
} else { } else {
console.error('FAIL', test, testObj.description); console.error('FAIL', test, testObj.description);