Fix: #4402 - quoted HTML in note titles are truncated

2 files changed, 27 insertions, 12 deletions

diff --git a/tests/app/Factories/MarkdownFactoryTest.php b/tests/app/Factories/MarkdownFactoryTest.php
index ec9d5b9eac..1ec520cf7b 100644
--- a/tests/app/Factories/MarkdownFactoryTest.php
+++ b/tests/app/Factories/MarkdownFactoryTest.php
@@ -37,7 +37,7 @@ class MarkdownFactoryTest extends TestCase
         $factory  = new MarkdownFactory();
 
         static::assertSame(
-            "FOO <a href=\"https://example.com\">https://example.com</a> BAR",
+            "<p>FOO <a href=\"https://example.com\">https://example.com</a> BAR</p>",
             $factory->autolink('FOO https://example.com BAR')
         );
     }
@@ -52,7 +52,7 @@ class MarkdownFactoryTest extends TestCase
         $tree    = $this->createStub(Tree::class);
 
         static::assertSame(
-            "FOO <a href=\"https://example.com\">https://example.com</a> BAR",
+            "<p>FOO <a href=\"https://example.com\">https://example.com</a> BAR</p>",
             $factory->autolink('FOO https://example.com BAR', $tree)
         );
     }
@@ -66,7 +66,7 @@ class MarkdownFactoryTest extends TestCase
         $factory  = new MarkdownFactory();
 
         static::assertSame(
-            "&lt;b&gt; <a href=\"https://example.com\">https://example.com</a> &lt;/b&gt;",
+            "<p>&lt;b&gt; <a href=\"https://example.com\">https://example.com</a> &lt;/b&gt;</p>",
             $factory->autolink('<b> https://example.com </b>')
         );
     }
@@ -79,12 +79,12 @@ class MarkdownFactoryTest extends TestCase
         $factory = new MarkdownFactory();
 
         static::assertSame(
-            "<p>FOO https://example.com BAR</p>\n",
+            "<p>FOO https://example.com BAR</p>",
             $factory->markdown('FOO https://example.com BAR')
         );
 
         static::assertSame(
-            "<p>FOO <a href=\"https://example.com\">https://example.com</a> BAR</p>\n",
+            "<p>FOO <a href=\"https://example.com\">https://example.com</a> BAR</p>",
             $factory->markdown('FOO <https://example.com> BAR')
         );
     }
@@ -98,12 +98,12 @@ class MarkdownFactoryTest extends TestCase
         $factory = new MarkdownFactory();
 
         static::assertSame(
-            "<p>FOO https://example.com BAR</p>\n",
+            '<p>FOO https://example.com BAR</p>',
             $factory->markdown('FOO https://example.com BAR', $tree)
         );
 
         static::assertSame(
-            "<p>FOO <a href=\"https://example.com\">https://example.com</a> BAR</p>\n",
+            '<p>FOO <a href="https://example.com">https://example.com</a> BAR</p>',
             $factory->markdown('FOO <https://example.com> BAR', $tree)
         );
     }
@@ -116,7 +116,7 @@ class MarkdownFactoryTest extends TestCase
         $factory = new MarkdownFactory();
 
         static::assertSame(
-            "<p>&lt;b&gt; <a href=\"https://example.com\">https://example.com</a> &lt;/b&gt;</p>\n",
+            '<p>&lt;b&gt; <a href="https://example.com">https://example.com</a> &lt;/b&gt;</p>',
             $factory->markdown('<b> <https://example.com> </b>')
         );
     }
@@ -129,12 +129,12 @@ class MarkdownFactoryTest extends TestCase
         $factory = new MarkdownFactory();
 
         static::assertSame(
-            "alpha<br />beta<br />gamma<br />\ndelta",
+            '<p>alpha<br />beta<br />gamma<br />delta</p>',
             $factory->autolink("alpha\nbeta\ngamma  \ndelta")
         );
 
         static::assertSame(
-            "<p>alpha<br />beta<br />gamma<br />\ndelta</p>\n",
+            '<p>alpha<br />beta<br />gamma<br />delta</p>',
             $factory->markdown("alpha\nbeta\ngamma  \ndelta")
         );
     }
@@ -147,12 +147,12 @@ class MarkdownFactoryTest extends TestCase
         $factory = new MarkdownFactory();
 
         static::assertSame(
-            "alpha<br />beta<br /><br />gamma<br />delta",
+            '<p>alpha<br />beta</p><p>gamma<br />delta</p>',
             $factory->autolink("alpha\nbeta\n\n\n\ngamma\ndelta")
         );
 
         static::assertSame(
-            "<p>alpha<br />beta</p>\n<p>gamma<br />delta</p>\n",
+            '<p>alpha<br />beta</p><p>gamma<br />delta</p>',
             $factory->markdown("alpha\nbeta\n\n\n\ngamma\ndelta")
         );
     }
diff --git a/tests/app/NoteTest.php b/tests/app/NoteTest.php
index 56001e255e..59954ebd67 100644
--- a/tests/app/NoteTest.php
+++ b/tests/app/NoteTest.php
@@ -38,6 +38,9 @@ class NoteTest extends TestCase
         self::assertTrue(class_exists(Note::class));
     }
 
+    /**
+     * @return void
+     */
     public function testNoteName(): void
     {
         $tree = $this->createStub(Tree::class);
@@ -45,4 +48,16 @@ class NoteTest extends TestCase
 
         self::assertSame('<bdi>1</bdi>', $note->fullName());
     }
+
+    /**
+     * @return void
+     */
+    public function testNoteNameWithHtmlEntities(): void
+    {
+        $tree = $this->createStub(Tree::class);
+        $text = '"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt." "a quote"';
+        $note = new Note('X123', "0 @X123@ NOTE " . $text, null, $tree);
+
+        self::assertSame('<bdi>&quot;Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt.&quot; &quot;a quot…</bdi>', $note->fullName());
+    }
 }