From 9dffb13be799d41a01cb75432bfc3ce064df9747 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 2 Apr 2025 09:47:49 -0400 Subject: [PATCH] fix test errors in MfmService.ts --- packages/backend/src/core/MfmService.ts | 9 +++------ packages/backend/test/unit/MfmService.ts | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/packages/backend/src/core/MfmService.ts b/packages/backend/src/core/MfmService.ts index 9317da5b69..e51341ba0a 100644 --- a/packages/backend/src/core/MfmService.ts +++ b/packages/backend/src/core/MfmService.ts @@ -6,7 +6,7 @@ import { URL } from 'node:url'; import { Inject, Injectable } from '@nestjs/common'; import * as parse5 from 'parse5'; -import { Window, XMLSerializer } from 'happy-dom'; +import { Window } from 'happy-dom'; import { DI } from '@/di-symbols.js'; import type { Config } from '@/config.js'; import { intersperse } from '@/misc/prelude/array.js'; @@ -577,7 +577,7 @@ export class MfmService { appendChildren(nodes, body); // Remove the unnecessary namespace - const serialized = new XMLSerializer().serializeToString(body).replace(/^\s*

/, '

'); + const serialized = body.outerHTML; happyDOM.close().catch(err => {}); @@ -848,10 +848,7 @@ export class MfmService { body.appendChild(quote); } - let result = new XMLSerializer().serializeToString(body); - - // Remove the unnecessary namespace - result = result.replace(/^\s*

/, '

'); + let result = body.outerHTML; if (inline) { result = result.replace(/^

/, '').replace(/<\/p>$/, ''); diff --git a/packages/backend/test/unit/MfmService.ts b/packages/backend/test/unit/MfmService.ts index 41480fdd51..e54c006a4f 100644 --- a/packages/backend/test/unit/MfmService.ts +++ b/packages/backend/test/unit/MfmService.ts @@ -24,13 +24,13 @@ describe('MfmService', () => { describe('toHtml', () => { test('br', () => { const input = 'foo\nbar\nbaz'; - const output = '

foo
bar
baz

'; + const output = '

foo
bar
baz

'; assert.equal(mfmService.toHtml(mfm.parse(input)), output); }); test('br alt', () => { const input = 'foo\r\nbar\rbaz'; - const output = '

foo
bar
baz

'; + const output = '

foo
bar
baz

'; assert.equal(mfmService.toHtml(mfm.parse(input)), output); });