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

Fix DOMParser rules to search also outside the body tag
codeigniter4 · Jan 7, 2021 · 02725d8 · 02725d8
2 parents 440ca29 + d0df601
commit 02725d8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
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();