assertHtml() should accept whitespace before a closing tag.

Allow any amount of whitespace between tags. Refs #10117
cakephp · Jan 28, 2017 · 9ed93eb · 9ed93eb
1 parent 41b6e4b
commit 9ed93eb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/TestSuite/TestCase.php b/src/TestSuite/TestCase.php
@@ -401,7 +401,7 @@ public function assertHtml($expected, $string, $fullDebug = false)
                     }
                     $regex[] = [
                         sprintf('%sClose %s tag', $prefix[0], substr($tags, strlen($match[0]))),
-                        sprintf('%s<[\s]*\/[\s]*%s[\s]*>[\n\r]*', $prefix[1], substr($tags, strlen($match[0]))),
+                        sprintf('%s\s*<[\s]*\/[\s]*%s[\s]*>[\n\r]*', $prefix[1], substr($tags, strlen($match[0]))),
                         $i,
                     ];
                     continue;

diff --git a/tests/TestCase/TestSuite/AssertHtmlTest.php b/tests/TestCase/TestSuite/AssertHtmlTest.php
@@ -9,6 +9,24 @@
  */
 class AssertHtmlTest extends TestCase
 {
+    public function testAssertHtmlWhitespace()
+    {
+        $input = <<<HTML
+<div class="wrapper">
+    <h4 class="widget-title">Popular tags
+        <i class="i-icon"></i>
+    </h4>
+</div>
+HTML;
+        $pattern = [
+            'div' => ['class' => 'wrapper'],
+            'h4' => ['class' => 'widget-title'], 'Popular tags',
+            'i' => ['class' => 'i-icon'], '/i',
+            '/h4',
+            '/div'
+        ];
+        $this->assertHtml($pattern, $input);
+    }
     /**
      * test assertHtml works with single and double quotes
      *