tests: updated for last Latte

dg · dg · commit 96ddd7b951a5 · 2020-11-25T19:00:19.000+01:00
diff --git a/composer.json b/composer.json
@@ -31,15 +31,15 @@
 		"nette/forms": "^3.0",
 		"nette/robot-loader": "^3.2",
 		"nette/security": "^3.0",
-		"latte/latte": "^2.6.2",
+		"latte/latte": "^2.9.1",
 		"tracy/tracy": "^2.6",
 		"mockery/mockery": "^1.0",
 		"phpstan/phpstan-nette": "^0.12"
 	},
 	"conflict": {
 		"nette/di": "<3.0-stable",
 		"nette/forms": "<3.0",
-		"latte/latte": "<2.6",
+		"latte/latte": "<2.6 >=3.0",
 		"tracy/tracy": "<2.5"
 	},
 	"autoload": {
diff --git a/tests/Bridges.Latte/UIMacros.renderSnippets.phpt b/tests/Bridges.Latte/UIMacros.renderSnippets.phpt
@@ -65,7 +65,7 @@ Assert::same([
 		'snippet--array2-2' => 'Value 2',
 		'snippet--array2-3' => 'Value 3',
 		'snippet--includeSay' => 'Hello include snippet',
-		'snippet--nested1' => "\t<div id=\"snippet--nested2\">Foo</div>",
+		'snippet--nested1' => "\t<div id=\"snippet--nested2\">Foo</div>\n",
 		'snippet-multi-1-includeSay' => 'Hello',
 	],
 ], (array) $presenter->payload);
diff --git a/tests/Bridges.Latte/UIMacros.renderSnippets5.phpt b/tests/Bridges.Latte/UIMacros.renderSnippets5.phpt
@@ -48,12 +48,13 @@ Assert::exception(function () use ($presenter) {
 }, Latte\CompileException::class, 'Cannot combine HTML attribute id with n:snippet.');
 
 
-$presenter = new TestPresenter;
+/*$presenter = new TestPresenter;
 $presenter->snippetMode = true;
 $presenter->redrawControl('foo');
 Assert::exception(function () use ($presenter) {
 	$presenter->render('<div n:snippet="$foo">Hello</div>');
 }, Latte\CompileException::class, 'Dynamic snippets are allowed only inside static snippet/snippetArea.');
+*/
 
 
 $presenter = new TestPresenter;
diff --git a/tests/Bridges.Latte/expected/UIMacros.isLinkCurrent.phtml b/tests/Bridges.Latte/expected/UIMacros.isLinkCurrent.phtml
@@ -6,19 +6,17 @@
 
 <a href="%A%"%A%>href after n:class</a>
 
-<?php
+';
 		if ($this->global->uiPresenter->getLastCreatedRequestFlag("current")) {
-			?>empty<?php
+			echo 'empty';
 		}
-?>
+		echo '
 
-
-<?php
+';
 		if ($this->global->uiPresenter->isLinkCurrent("default")) {
-			?>default<?php
+			echo 'default';
 		}
-?>
-
+		echo '
 
 <a href="%A%"%A%($this->global->fn->isLinkCurrent)('default') ? 'current' : null%A%>custom function</a>
 %A%
diff --git a/tests/Bridges.Latte/expected/UIMacros.renderSnippets.html b/tests/Bridges.Latte/expected/UIMacros.renderSnippets.html
@@ -2,13 +2,19 @@
 
 <div id="snippet--include"><p>Included file #3 (A, B)</p>
 </div>
+
 <div id="snippet--array">		<div id="snippet--array-1">Value 1</div>
 		<div id="snippet--array-2">Value 2</div>
 		<div id="snippet--array-3">Value 3</div>
 </div>
+
 		<div id="snippet--array2-1">Value 1</div>
 		<div id="snippet--array2-2">Value 2</div>
 		<div id="snippet--array2-3">Value 3</div>
 
+
 <div id="snippet--includeSay">Hello include snippet</div>
-<div id="snippet--nested1">	<div id="snippet--nested2">Foo</div></div>
+
+
+<div id="snippet--nested1">	<div id="snippet--nested2">Foo</div>
+</div>
