Added tests to check issue erusev#44.

Daniel-KM · Jun 18, 2017 · 8be5b5a · 8be5b5a
1 parent 3edee6a
commit 8be5b5a
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 12 deletions.
diff --git a/ParsedownExtra.php b/ParsedownExtra.php
@@ -1169,18 +1169,17 @@ protected function parseAttributeData($attributeString)
 
     # ~
 
-    protected function processText($document, $element){
+    protected function processText($document, $element)
+    {
         $nodeMarkup = $document->saveHTML($element);
 
-        $text = '';
-
-        if ($element instanceof DOMElement and !in_array($element->nodeName, $this->textLevelElements) and !in_array($element->nodeName, $this->voidElements)){
-            if( $element->hasChildNodes() ){
-                $text = $this->processTags($nodeMarkup);
-            }else{
-                $text = $nodeMarkup;
-            }
-        }else{
+        if ($element instanceof DOMElement
+            && !in_array($element->nodeName, $this->textLevelElements)
+            && !in_array($element->nodeName, $this->voidElements)
+            && $element->hasChildNodes()
+        ) {
+            $text = $this->processTags($nodeMarkup);
+        } else {
             $text = $nodeMarkup;
         }
         return $text;
@@ -1223,7 +1222,7 @@ protected function processTag($document, $element) # recursive
 
         $elementText = '';
 
-        if ($element instanceof DOMElement and $element->getAttribute('markdown') === '1')
+        if ($element instanceof DOMElement && $element->getAttribute('markdown') === '1')
         {
             if( $element->hasChildNodes() ){
                 foreach ($element->childNodes as $Node){
@@ -1242,7 +1241,9 @@ protected function processTag($document, $element) # recursive
                 foreach ($element->childNodes as $Node){
                     $elementText .= $this->processText($document, $Node);
                 }
-            }else{
+            } elseif ($element instanceof DOMElement){
+                $elementText =  $document->saveHTML($element);
+            } else {
                 $elementText =  $this->processText($document, $element);
             }
 

diff --git a/test/ParsedownExtraTest.php b/test/ParsedownExtraTest.php
@@ -68,4 +68,38 @@ public function test_footnote_prefix()
 
         $this->assertEquals( $expectedOutput, $parsedown->text( $markdownInput ) );
     }
+
+    public function testMultipleHtmlMarkupInline()
+    {
+        // @url https://github.com/erusev/parsedown-extra/issues/44#issuecomment-80815953
+        $input = <<<EOF
+<div>1</div><p>2</p>
+The p tag (and contents), along with this line are eaten.
+EOF;
+        $expectedMarkup = <<<EOF
+<div>1</div><p>2</p>
+<p>The p tag (and contents), along with this line are eaten.</p>
+EOF;
+        $actualMarkup = (new ParsedownExtra())->text($input);
+
+        $this->assertEquals($expectedMarkup, $actualMarkup);
+    }
+
+    public function testInlineIframe()
+    {
+        // @url https://github.com/erusev/parsedown-extra/issues/44#issuecomment-106090346
+        $expectedMarkup = '<iframe />';
+        $actualMarkup = (new ParsedownExtra())->text($expectedMarkup);
+
+        $this->assertEquals($expectedMarkup, $actualMarkup);
+    }
+
+    public function testStripping()
+    {
+        // @url https://github.com/erusev/parsedown-extra/issues/44#issuecomment-159655861
+        $expectedMarkup = '<p><strong>Contact Method:</strong> email</p><p>Test</p><p><em>Some italic text.</em></p>';
+        $actualMarkup = (new ParsedownExtra())->text($expectedMarkup);
+
+        $this->assertEquals($expectedMarkup, $actualMarkup);
+    }
 }