Cleanup/Fix unit tests

pH-7 · Apr 18, 2022 · cfd1585 · cfd1585
1 parent ae4b21c
commit cfd1585
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/src/Convert.php b/src/Convert.php
@@ -22,11 +22,14 @@ class Convert
 
     public function __construct(string $htmlCode)
     {
+        $this->htmlCode = $htmlCode;
+
+        $this->convertHtmlEntities();
+
         $oDom = new DOMDocument();
-        $oDom->loadHTML($htmlCode);
+        $oDom->loadHTML($this->htmlCode);
         $this->htmlCode = trim($oDom->textContent);
 
-        $this->convertHtmlEntities();
         $this->parse();
     }
 

diff --git a/tests/ConvertTest.php b/tests/ConvertTest.php
@@ -20,9 +20,7 @@ public function testConvertHtmlParagraph(): void
 This is a paragraph.
 TEXT;
 
-        $this->html2Text = new Html2Text($htmlCode);
-        $actual = $this->html2Text->getText();
-
+        $actual = (new Html2Text($htmlCode))->getText();
         $this->assertSame($expectedOutput, $actual);
     }
 
@@ -51,9 +49,16 @@ public function testConvertHtmlBody(): void
 Hello World.
 TEXT;
 
-        $this->html2Text = new Html2Text($htmlDocument);
-        $actual = $this->html2Text->getText();
+        $actual = (new Html2Text($htmlDocument))->getText();
 
         $this->assertSame($expectedOutput, $actual);
     }
+
+    public function testHtmlCodeContainingHtmlEntities(): void
+    {
+        $htmlCode = 'Hi&#44;&nbsp;You';
+        $actual = (new Html2Text($htmlCode))->getText();
+
+        $this->assertSame('Hi, You', $actual);
+    }
 }