mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-22 16:36:15 -04:00
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:
parent
5673a76b38
commit
c5cf7ab144
4 changed files with 14 additions and 14 deletions
|
@ -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) {
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue