Skip to content

Commit 317f29d

Browse files
committed
unit tests fix
Signed-off-by: MarioRadu <magda_marior@yahoo.com>
1 parent c83dfc3 commit 317f29d

File tree

1 file changed

+11
-20
lines changed

1 file changed

+11
-20
lines changed

test/Unit/App/Twig/Extension/RouteExtensionTest.php

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66

77
use Admin\App\Twig\Extension\RouteExtension;
88
use AdminTest\Unit\UnitTest;
9-
use Laminas\Diactoros\ServerRequest;
10-
use Laminas\Diactoros\Uri;
119
use Mezzio\Helper\UrlHelper;
12-
use Mezzio\Router\RouterInterface;
10+
use Mezzio\Router\RouteResult;
1311
use PHPUnit\Framework\MockObject\Exception;
12+
use Psr\Http\Message\ServerRequestInterface;
1413
use Twig\TwigFunction;
1514

1615
use function method_exists;
@@ -50,29 +49,21 @@ public function testWillAddExistingFunctions(): void
5049
$this->assertSame($twigFunction->getName(), $callable[1]);
5150
}
5251

53-
/**
54-
* @throws Exception
55-
*/
56-
public function testWillGetCurrentRoute(): void
57-
{
58-
$router = $this->createMock(RouterInterface::class);
59-
$request = new ServerRequest(uri: new Uri('/test'));
60-
$urlHelper = new UrlHelper($router);
61-
$urlHelper->setRequest($request);
62-
$routeExtension = new RouteExtension($urlHelper);
63-
$this->assertSame('/test', $routeExtension->getCurrentRoute());
64-
}
65-
6652
/**
6753
* @throws Exception
6854
*/
6955
public function testIsRoute(): void
7056
{
71-
$router = $this->createMock(RouterInterface::class);
72-
$request = new ServerRequest(uri: new Uri('/test'));
73-
$urlHelper = new UrlHelper($router);
57+
$request = $this->createMock(ServerRequestInterface::class);
58+
$urlHelper = $this->createMock(UrlHelper::class);
59+
$routeResult = $this->createMock(RouteResult::class);
60+
61+
$routeResult->method('getMatchedRouteName')->willReturn('test');
62+
$urlHelper->method('getRouteResult')->willReturn($routeResult);
63+
7464
$urlHelper->setRequest($request);
7565
$routeExtension = new RouteExtension($urlHelper);
76-
$this->assertSame(true, $routeExtension->isRoute('/test'));
66+
67+
$this->assertSame(true, $routeExtension->isRoute('test'));
7768
}
7869
}

0 commit comments

Comments
 (0)