jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added role cards to permission screen (#4401)

Browse Source 
* simplify creating new roles by auto-replacing input
This commit is contained in:
Kevin Papst
2023-11-04 20:17:05 +01:00
committed by GitHub
parent 0b1625175b
commit a1d9874c13
7 changed files with 98 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tests/Controller/PermissionControllerTest.php
View File

@@ -19,17 +19,17 @@ use App\Entity\User;
*/
class PermissionControllerTest extends ControllerBaseTest
{
public function testIsSecure()
public function testIsSecure(): void
{
$this->assertUrlIsSecured('/admin/permissions');
}
public function testIsSecureForRole()
public function testIsSecureForRole(): void
{
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/permissions');
}
public function testPermissions()
public function testPermissions(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, '/admin/permissions');
@@ -52,17 +52,17 @@ class PermissionControllerTest extends ControllerBaseTest
self::assertStringContainsString('<th data-field="ROLE_SUPER_ADMIN" class="alwaysVisible text-center bg-orange-lt col_ROLE_SUPER_ADMIN">', $content);
}
public function testCreateRoleIsSecured()
public function testCreateRoleIsSecured(): void
{
$this->assertUrlIsSecured('/admin/permissions/roles/create');
}
public function testCreateRoleIsSecuredForRole()
public function testCreateRoleIsSecuredForRole(): void
{
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/permissions');
}
public function testCreateRole()
public function testCreateRole(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, '/admin/permissions/roles/create');
@@ -79,17 +79,17 @@ class PermissionControllerTest extends ControllerBaseTest
$this->assertTableHeader($content);
}
public function testDeleteRoleIsSecured()
public function testDeleteRoleIsSecured(): void
{
$this->assertUrlIsSecured('/admin/permissions/roles/1/delete/sdfsdfsdfsd');
}
public function testDeleteRoleIsSecuredForRole()
public function testDeleteRoleIsSecuredForRole(): void
{
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/permissions');
}
public function testDeleteRole()
public function testDeleteRole(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, '/admin/permissions/roles/create');
@@ -132,7 +132,7 @@ class PermissionControllerTest extends ControllerBaseTest
$this->assertEquals(['ROLE_TEAMLEAD', 'ROLE_SUPER_ADMIN', 'TEST_ROLE', 'ROLE_USER'], $user->getRoles());
$this->request($client, '/admin/permissions');
$node = $client->getCrawler()->filter('table.dataTable thead th a.confirmation-link');
$node = $client->getCrawler()->filter('div.card .card-title a.confirmation-link');
self::assertEquals(1, $node->count());
$this->request($client, $node->attr('href'));
@@ -148,17 +148,17 @@ class PermissionControllerTest extends ControllerBaseTest
$this->assertEquals(['ROLE_TEAMLEAD', 'ROLE_SUPER_ADMIN', 'ROLE_USER'], $user->getRoles());
}
public function testSavePermissionIsSecured()
public function testSavePermissionIsSecured(): void
{
$this->assertUrlIsSecured('/admin/permissions/roles/1/view_user/1/asdfasdf', 'POST');
}
public function testSavePermissionIsSecuredForRole()
public function testSavePermissionIsSecuredForRole(): void
{
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/permissions');
}
public function testSavePermission()
public function testSavePermission(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, '/admin/permissions/roles/create');

6
tests/Entity/RoleTest.php
View File

@@ -22,6 +22,7 @@ class RoleTest extends TestCase
$sut = new Role();
self::assertNull($sut->getId());
self::assertNull($sut->getName());
self::assertFalse($sut->isUser());
}
public function testSetterAndGetter(): void
@@ -30,8 +31,13 @@ class RoleTest extends TestCase
$sut->setName('foo');
self::assertEquals('FOO', $sut->getName());
self::assertFalse($sut->isUser());
$sut->setName('BAR');
self::assertEquals('BAR', $sut->getName());
self::assertFalse($sut->isUser());
$sut->setName('ROLE_USER');
self::assertTrue($sut->isUser());
}
}

60
tests/phpstan.neon
View File

@@ -2572,66 +2572,6 @@ parameters:
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testCreateRole\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testCreateRoleIsSecured\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testCreateRoleIsSecuredForRole\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testDeleteRole\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testDeleteRoleIsSecured\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testDeleteRoleIsSecuredForRole\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testIsSecure\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testIsSecureForRole\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testPermissions\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testSavePermission\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testSavePermissionIsSecured\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:testSavePermissionIsSecuredForRole\\(\\) has no return type specified\\.$#"
count: 1
path: Controller/PermissionControllerTest.php
-
message: "#^Parameter \\#1 \\$content of method App\\\\Tests\\\\Controller\\\\PermissionControllerTest\\:\\:assertTableHeader\\(\\) expects string, string\\|false given\\.$#"
count: 2