merge: more upstream changes

2024-02-07 21:52:27 +01:00
parent 1fa347390a 52bf808d89
commit af5ebdfced
11 changed files with 123 additions and 23 deletions
@@ -33,6 +33,12 @@ describe('MfmService', () => {
 			const output = '<p><span>foo<br>bar<br>baz</span></p>';
 			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
 		});
+
+		test('Do not generate unnecessary span', () => {
+			const input = 'foo $[tada bar]';
+			const output = '<p>foo <i>bar</i></p>';
+			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
+		});
 	});

 	describe('fromHtml', () => {