tests: improved tests

composer.json

@@ -33,7 +33,7 @@
 		"nette/security": "^3.0",
 		"latte/latte": "^2.10.2 || ^3.0.12",
 		"tracy/tracy": "^2.6",
-		"mockery/mockery": "^1.0",
+		"mockery/mockery": "^1.0 || ^2.0",
 		"phpstan/phpstan-nette": "^0.12",
 		"jetbrains/phpstorm-attributes": "dev-master"
 	},

tests/Bridges.Latte3/TemplateFactory.nonce.control.phpt → tests/Bridges.Latte3/UIExtension.nonce.control.phpt

@@ -1,14 +1,13 @@
 <?php
 
 /**
- * Test: TemplateFactory nonce
+ * Test: UIExtension nonce
  * @phpVersion 8.0
  */
 
 declare(strict_types=1);
 
 use Nette\Application\UI;
-use Nette\Bridges\ApplicationLatte;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
@@ -17,22 +16,16 @@ if (version_compare(Latte\Engine::VERSION, '3', '<')) {
 	Tester\Environment::skip('Test for Latte 3');
 }
 
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
 $response = Mockery::mock(Nette\Http\IResponse::class);
 $response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
 
 $control = Mockery::mock(UI\Control::class);
 $control->shouldReceive('getPresenterIfExists')->andReturn(null);
 $control->shouldIgnoreMissing();
 
-$factory = new ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($control);
-
+$latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension($control));
 
 Assert::match(
 	'<script></script>',

tests/Bridges.Latte3/TemplateFactory.nonce.presenter.phpt → tests/Bridges.Latte3/UIExtension.nonce.presenter.phpt

@@ -1,14 +1,13 @@
 <?php
 
 /**
- * Test: TemplateFactory nonce
+ * Test: UIExtension nonce
  * @phpVersion 8.0
  */
 
 declare(strict_types=1);
 
 use Nette\Application\UI;
-use Nette\Bridges\ApplicationLatte;
 use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
@@ -19,11 +18,6 @@ if (version_compare(Latte\Engine::VERSION, '3', '<')) {
 
 Tester\Environment::bypassFinals();
 
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
 $response = Mockery::mock(Nette\Http\IResponse::class);
 $response->shouldReceive('getHeader')->with('Content-Security-Policy')->andReturn("hello 'nonce-abcd123==' world");
 
@@ -32,10 +26,9 @@ $presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
 $presenter->shouldReceive('getHttpResponse')->andReturn($response);
 $presenter->shouldIgnoreMissing();
 
-$factory = new ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($presenter);
-
+$latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension($presenter));
 
 Assert::match(
 	'<script nonce="abcd123=="></script>',

tests/Bridges.Latte3/expected/isLinkCurrent.php

@@ -26,7 +26,7 @@
 <a href="';
 		echo LR\Filters::escapeHtmlAttr($this->global->uiControl->link('default')) /* line 9 */;
 		echo '"';
-		echo ($ʟ_tmp = array_filter([($this->global->fn->isLinkCurrent)('default') ? 'current' : null])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line 9 */;
+		echo ($ʟ_tmp = array_filter([($this->global->fn->isLinkCurrent)(%a%'default') ? 'current' : null])) ? ' class="' . LR\Filters::escapeHtmlAttr(implode(" ", array_unique($ʟ_tmp))) . '"' : "" /* line 9 */;
 		echo '>custom function</a>
 ';
 %A%

tests/Bridges.Latte3/isLinkCurrent().phpt

@@ -17,20 +17,14 @@ if (version_compare(Latte\Engine::VERSION, '3', '<')) {
 
 Tester\Environment::bypassFinals();
 
-$latte = new Latte\Engine;
-
-$latteFactory = Mockery::mock(Nette\Bridges\ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
 $presenter = Mockery::mock(Nette\Application\UI\Presenter::class);
 $presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
 $presenter->shouldReceive('getHttpResponse')->andReturn((Mockery::mock(Nette\Http\IResponse::class))->shouldIgnoreMissing());
 $presenter->shouldIgnoreMissing();
 
-$factory = new Nette\Bridges\ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($presenter);
-
+$latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension($presenter));
 
 Assert::matchFile(
 	__DIR__ . '/expected/isLinkCurrent.php',

tests/Bridges.Latte3/{ifCurrent}.phpt

@@ -16,18 +16,14 @@ Tester\Environment::bypassFinals();
 
 $latte = new Latte\Engine;
 
-$latteFactory = Mockery::mock(Nette\Bridges\ApplicationLatte\LatteFactory::class);
-$latteFactory->shouldReceive('create')->andReturn($latte);
-
 $presenter = Mockery::mock(Nette\Application\UI\Presenter::class);
 $presenter->shouldReceive('getPresenterIfExists')->andReturn($presenter);
 $presenter->shouldReceive('getHttpResponse')->andReturn((Mockery::mock(Nette\Http\IResponse::class))->shouldIgnoreMissing());
 $presenter->shouldIgnoreMissing();
 
-$factory = new Nette\Bridges\ApplicationLatte\TemplateFactory($latteFactory);
-$factory->createTemplate($presenter);
-
+$latte = new Latte\Engine;
 $latte->setLoader(new Latte\Loaders\StringLoader);
+$latte->addExtension(new Nette\Bridges\ApplicationLatte\UIExtension($presenter));
 
 Assert::matchFile(
 	__DIR__ . '/expected/ifCurrent.php',

tests/UI/Component.redirect().phpt

@@ -26,7 +26,7 @@ class TestPresenter extends Application\UI\Presenter
 
 	public function sendResponse(Application\Response $response): void
 	{
-		$this->response = $response;
+		parent::sendResponse($this->response = $response);
 	}
 }
 
@@ -43,39 +43,54 @@ $presenter->injectPrimary(
 
 
 test('', function () use ($presenter) {
-	$presenter->redirect('foo');
+	try {
+		$presenter->redirect('foo');
+	} catch (Throwable $e) {
+	}
 	Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response);
 	Assert::same(302, $presenter->response->getCode());
 	Assert::same('http://localhost/?action=foo&presenter=test', $presenter->response->getUrl());
 });
 
 
 test('', function () use ($presenter) {
-	$presenter->redirect('foo', ['arg' => 1]);
+	try {
+		$presenter->redirect('foo', ['arg' => 1]);
+	} catch (Throwable $e) {
+	}
 	Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response);
 	Assert::same(302, $presenter->response->getCode());
 	Assert::same('http://localhost/?arg=1&action=foo&presenter=test', $presenter->response->getUrl());
 });
 
 
 test('', function () use ($presenter) {
-	$presenter->redirect('foo', 2);
+	try {
+		$presenter->redirect('foo', 2);
+	} catch (Throwable $e) {
+	}
 	Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response);
 	Assert::same(302, $presenter->response->getCode());
 	Assert::same('http://localhost/?val=2&action=foo&presenter=test', $presenter->response->getUrl());
 });
 
 
 test('', function () use ($presenter) {
-	$presenter->redirectPermanent('foo', 2);
+	try {
+		$presenter->redirectPermanent('foo', 2);
+	} catch (Throwable $e) {
+	}
 	Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response);
 	Assert::same(301, $presenter->response->getCode());
 	Assert::same('http://localhost/?val=2&action=foo&presenter=test', $presenter->response->getUrl());
 });
 
 
 test('', function () use ($presenter) {
-	$presenter->redirectPermanent('foo', ['arg' => 1]);
+	try {
+		$presenter->redirectPermanent('foo', ['arg' => 1]);
+	} catch (Throwable $e) {
+	}
 	Assert::type(Nette\Application\Responses\RedirectResponse::class, $presenter->response);
 	Assert::same(301, $presenter->response->getCode());
 	Assert::same('http://localhost/?arg=1&action=foo&presenter=test', $presenter->response->getUrl());

tests/UI/Presenter.getParameters.phpt → tests/UI/ComponentReflection.getParameters().phpt

@@ -1,9 +1,5 @@
 <?php
 
-/**
- * Test: Nette\Application\UI\Presenter::getRequestParams
- */
-
 declare(strict_types=1);
 
 use Nette\Application\Attributes\Parameter;