Merge pull request #4070 from michalsn/fix/assertSee-fix

paulbalandan · web-flow · commit 02725d8f256a · 2021-01-07T16:23:17.000+08:00
Fix DOMParser rules to search also outside the body tag
diff --git a/system/Test/DOMParser.php b/system/Test/DOMParser.php
@@ -237,19 +237,19 @@ protected function doXPath(?string $search, string $element, array $paths = [])
 		{
 			$path = empty($selector['tag'])
 				? "id(\"{$selector['id']}\")"
-				: "//body//{$selector['tag']}[@id=\"{$selector['id']}\"]";
+				: "//{$selector['tag']}[@id=\"{$selector['id']}\"]";
 		}
 		// By Class
 		elseif (! empty($selector['class']))
 		{
 			$path = empty($selector['tag'])
 				? "//*[@class=\"{$selector['class']}\"]"
-				: "//body//{$selector['tag']}[@class=\"{$selector['class']}\"]";
+				: "//{$selector['tag']}[@class=\"{$selector['class']}\"]";
 		}
 		// By tag only
 		elseif (! empty($selector['tag']))
 		{
-			$path = "//body//{$selector['tag']}";
+			$path = "//{$selector['tag']}";
 		}
 
 		if (! empty($selector['attr']))
diff --git a/tests/system/Test/DOMParserTest.php b/tests/system/Test/DOMParserTest.php
@@ -97,6 +97,19 @@ public function testSeeHTML()
 		$this->assertTrue($dom->see('<h1>'));
 	}
 
+	/**
+	 * @see https://github.com/codeigniter4/CodeIgniter4/issues/3984
+	 */
+	public function testSeeHTMLOutsideBodyTag()
+	{
+		$dom = new DOMParser();
+
+		$html = '<html><head><title>My Title</title></head><body><h1>Hello World</h1></body></html>';
+		$dom->withString($html);
+
+		$this->assertTrue($dom->see('My Title', 'title'));
+	}
+
 	public function testSeeFail()
 	{
 		$dom = new DOMParser();

Original file line number	Diff line number	Diff line change
`@@ -237,19 +237,19 @@ protected function doXPath(?string $search, string $element, array $paths = [])`
`237`	`237`	`{`
`238`	`238`	`$path = empty($selector['tag'])`
`239`	`239`	`? "id(\"{$selector['id']}\")"`
`240`		`- : "//body//{$selector['tag']}[@id=\"{$selector['id']}\"]";`
	`240`	`+ : "//{$selector['tag']}[@id=\"{$selector['id']}\"]";`
`241`	`241`	`}`
`242`	`242`	`// By Class`
`243`	`243`	`elseif (! empty($selector['class']))`
`244`	`244`	`{`
`245`	`245`	`$path = empty($selector['tag'])`
`246`	`246`	`? "//*[@class=\"{$selector['class']}\"]"`
`247`		`- : "//body//{$selector['tag']}[@class=\"{$selector['class']}\"]";`
	`247`	`+ : "//{$selector['tag']}[@class=\"{$selector['class']}\"]";`
`248`	`248`	`}`
`249`	`249`	`// By tag only`
`250`	`250`	`elseif (! empty($selector['tag']))`
`251`	`251`	`{`
`252`		`- $path = "//body//{$selector['tag']}";`
	`252`	`+ $path = "//{$selector['tag']}";`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`if (! empty($selector['attr']))`