From 8cececccc137e9c860b8271f0e38759c1be2808c Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Mon, 30 Dec 2019 17:37:37 +0100 Subject: [PATCH] skip tests which depend on modules --- tests/Router/SocketRouterTest.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tests/Router/SocketRouterTest.php b/tests/Router/SocketRouterTest.php index a818edac2..4efd6fd96 100644 --- a/tests/Router/SocketRouterTest.php +++ b/tests/Router/SocketRouterTest.php @@ -19,6 +19,7 @@ use Modules\Admin\Models\PermissionState; use phpOMS\Account\Account; use phpOMS\Account\PermissionAbstract; use phpOMS\Account\PermissionType; +use phpOMS\Autoloader; use phpOMS\Router\SocketRouter; require_once __DIR__ . '/../Autoloader.php'; @@ -54,7 +55,7 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase */ public function testInvalidRoutingFile() : void { - self::assertFalse($this->router->importFromFile(__Dir__ . '/invalidFile.php')); + self::assertFalse($this->router->importFromFile(__DIR__ . '/invalidFile.php')); } /** @@ -64,7 +65,7 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase */ public function testLoadingRoutesFromFile() : void { - self::assertTrue($this->router->importFromFile(__Dir__ . '/socketRouterTestFile.php')); + self::assertTrue($this->router->importFromFile(__DIR__ . '/socketRouterTestFile.php')); } /** @@ -74,7 +75,7 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase */ public function testRouteMatching() : void { - self::assertTrue($this->router->importFromFile(__Dir__ . '/socketRouterTestFile.php')); + self::assertTrue($this->router->importFromFile(__DIR__ . '/socketRouterTestFile.php')); self::assertEquals( [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']], @@ -108,7 +109,11 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase */ public function testWithValidPermissions() : void { - self::assertTrue($this->router->importFromFile(__Dir__ . '/socketRouterTestFilePermission.php')); + if (!Autoloader::exists('\Modules\Admin\Controller')) { + self::markTestSkipped(); + } + + self::assertTrue($this->router->importFromFile(__DIR__ . '/socketRouterTestFilePermission.php')); $perm = new class( null, @@ -141,7 +146,11 @@ class SocketRouterTest extends \PHPUnit\Framework\TestCase */ public function testWithInvalidPermissions() : void { - self::assertTrue($this->router->importFromFile(__Dir__ . '/socketRouterTestFilePermission.php')); + if (!Autoloader::exists('\Modules\Admin\Controller')) { + self::markTestSkipped(); + } + + self::assertTrue($this->router->importFromFile(__DIR__ . '/socketRouterTestFilePermission.php')); $perm2 = new class( null,