assertHtml() should accept whitespace before a closing tag.

markstory · markstory · commit 9ed93ebe5f89 · 2017-01-27T21:19:19.000-05:00
Allow any amount of whitespace between tags. Refs #10117
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
      *

Original file line number	Diff line number	Diff line change
`@@ -401,7 +401,7 @@ public function assertHtml($expected, $string, $fullDebug = false)`
`401`	`401`	`}`
`402`	`402`	`$regex[] = [`
`403`	`403`	`sprintf('%sClose %s tag', $prefix[0], substr($tags, strlen($match[0]))),`
`404`		`- sprintf('%s<[\s]\/[\s]%s[\s]>[\n\r]', $prefix[1], substr($tags, strlen($match[0]))),`
	`404`	`+ sprintf('%s\s<[\s]\/[\s]%s[\s]>[\n\r]*', $prefix[1], substr($tags, strlen($match[0]))),`
`405`	`405`	`$i,`
`406`	`406`	`];`
`407`	`407`	`continue;`