DOMDocument: remove script tags from DOM (TPresenter)

mrtnzlml-archive · Jul 24, 2016 · 5134803 · 5134803
1 parent bfb65ac
commit 5134803
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/Traits/TPresenter.php b/src/Traits/TPresenter.php
@@ -126,6 +126,8 @@ protected function checkAction($destination, $params = [], $post = [])
 			Assert::type('Nette\Application\UI\ITemplate', $response->getSource());
 
 			$html = (string)$response->getSource();
+			//DOMDocument doesn't handle HTML tags inside of script tags very well
+			$html = preg_replace('~<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>~', '', $html); //http://stackoverflow.com/a/6660315/3135248
 			$dom = \Tester\DomQuery::fromHtml($html);
 			Assert::true($dom->has('html'), "missing 'html' tag");
 			Assert::true($dom->has('title'), "missing 'title' tag");

diff --git a/tests/Traits/TPresenterTest.phpt b/tests/Traits/TPresenterTest.phpt
@@ -17,10 +17,9 @@ class TPresenterTest extends \Testbench\CustomPresenterTestCase
 	{
 		$this->checkAction('Presenter:default');
 
-		//FIXME: how to?
-		//Assert::error(function () {
-		//	$this->checkAction('Presenter:variabledoesntexist');
-		//}, E_NOTICE, 'Undefined variable: doesnexist');
+		Assert::error(function () {
+			$this->checkAction('Presenter:variabledoesntexist');
+		}, E_NOTICE, 'Undefined variable: doesnexist');
 	}
 
 	public function testClassicRenderShort()

diff --git a/tests/_helpers/presenters/templates/Presenter/variabledoesntexist.latte b/tests/_helpers/presenters/templates/Presenter/variabledoesntexist.latte
@@ -5,8 +5,8 @@
 	<title>TEST</title>
 </head>
 <body>
-	<div>
+	<script>
 		{$doesnexist}
-	</div>
+	</script>
 </body>
 </html>