tests: Ignore head tag on import / improved contentcollector tests

* fix accidental write to global variable
properly show pending tests
log test name in suite
better log output for received/expected strings

* cc tests: enable second nestedOL test

* ignore the head tag on import
This commit is contained in:
webzwo0i 2020-12-18 10:37:37 +01:00 committed by GitHub
parent 5673a76b38
commit c5cf7ab144
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions

View file

@ -203,17 +203,6 @@ async function doImport(req, res, padId) {
if (!req.directDatabaseAccess) {
text = await fsp_readFile(destFile, 'utf8');
/*
* The <title> tag needs to be stripped out, otherwise it is appended to the
* pad.
*
* Moreover, when using LibreOffice to convert the file, some classes are
* added to the <title> tag. This is a quick & dirty way of matching the
* title and comment it out independently on the classes that are set on it.
*/
text = text.replace('<title', '<!-- <title');
text = text.replace('</title>', '</title>-->');
// node on windows has a delay on releasing of the file lock.
// We add a 100ms delay to work around this
if (os.type().indexOf('Windows') > -1) {

View file

@ -36,7 +36,7 @@ exports.setPadHTML = async (pad, html) => {
// below the last line of an import
$('body').append('<p></p>');
const doc = $('html')[0];
const doc = $('body')[0];
apiLogger.debug('html:');
apiLogger.debug(html);