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

Upgrade tests to PhpUnit 10 (#5252)

Browse Source
This commit is contained in:
Kevin Papst
2024-12-22 01:25:30 +01:00
committed by GitHub
parent 9bd37fb695
commit c7f0508707
377 changed files with 3308 additions and 3409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Voter/AbstractVoterTest.php → tests/Voter/AbstractVoterTestCase.php
View File

@@ -17,7 +17,7 @@ use PHPUnit\Framework\TestCase;
use Symfony\Component\Cache\Adapter\ArrayAdapter;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
abstract class AbstractVoterTest extends TestCase
abstract class AbstractVoterTestCase extends TestCase
{
protected function getVoter(string $voterClass): Voter // @phpstan-ignore missingType.generics
{
@@ -29,7 +29,7 @@ abstract class AbstractVoterTest extends TestCase
return $voter;
}
protected function getUser(int $id, ?string $role): User
protected static function getUser(int $id, ?string $role): User
{
$roles = [];
if (!empty($role)) {

16
tests/Voter/ActivityVoterTest.php
View File

@@ -21,7 +21,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\ActivityVoter
*/
class ActivityVoterTest extends AbstractVoterTest
class ActivityVoterTest extends AbstractVoterTestCase
{
/**
* @dataProvider getTestData
@@ -36,16 +36,16 @@ class ActivityVoterTest extends AbstractVoterTest
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(ActivityVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
self::assertEquals($result, $sut->vote($token, $subject, [$attribute]));
}
public function getTestData()
public static function getTestData()
{
$user0 = $this->getUser(0, null);
$user1 = $this->getUser(1, User::ROLE_USER);
$user2 = $this->getUser(2, User::ROLE_TEAMLEAD);
$user3 = $this->getUser(3, User::ROLE_ADMIN);
$user4 = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$user0 = self::getUser(0, null);
$user1 = self::getUser(1, User::ROLE_USER);
$user2 = self::getUser(2, User::ROLE_TEAMLEAD);
$user3 = self::getUser(3, User::ROLE_ADMIN);
$user4 = self::getUser(4, User::ROLE_SUPER_ADMIN);
$result = VoterInterface::ACCESS_GRANTED;
foreach ([$user3, $user4] as $user) {

16
tests/Voter/CustomerVoterTest.php
View File

@@ -19,7 +19,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\CustomerVoter
*/
class CustomerVoterTest extends AbstractVoterTest
class CustomerVoterTest extends AbstractVoterTestCase
{
public function assertVote(User $user, $subject, $attribute, $result): void
{
@@ -27,16 +27,16 @@ class CustomerVoterTest extends AbstractVoterTest
$sut = $this->getVoter(CustomerVoter::class);
$actual = $sut->vote($token, $subject, [$attribute]);
$this->assertEquals($result, $actual, \sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
self::assertEquals($result, $actual, \sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
}
public function testVote(): void
{
$userNoRole = $this->getUser(0, 'foo');
$userStandard = $this->getUser(1, User::ROLE_USER);
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = $this->getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$userNoRole = self::getUser(0, 'foo');
$userStandard = self::getUser(1, User::ROLE_USER);
$userTeamlead = self::getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = self::getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = self::getUser(4, User::ROLE_SUPER_ADMIN);
$result = VoterInterface::ACCESS_GRANTED;
foreach ([$userAdmin, $userSuperAdmin] as $user) {
@@ -55,7 +55,7 @@ class CustomerVoterTest extends AbstractVoterTest
$team->removeCustomer($customer);
}
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$userTeamlead = self::getUser(2, User::ROLE_TEAMLEAD);
$result = VoterInterface::ACCESS_DENIED;
foreach ([$userNoRole, $userStandard] as $user) {

16
tests/Voter/EntityMultiRoleVoterTest.php
View File

@@ -20,7 +20,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\EntityMultiRoleVoter
*/
class EntityMultiRoleVoterTest extends AbstractVoterTest
class EntityMultiRoleVoterTest extends AbstractVoterTestCase
{
/**
* @dataProvider getTestData
@@ -30,16 +30,16 @@ class EntityMultiRoleVoterTest extends AbstractVoterTest
$token = new UsernamePasswordToken($user, 'foo', $user->getRoles());
$sut = $this->getVoter(EntityMultiRoleVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]), 'Failed on permission "' . $attribute . '" for User ' . $user->getUserIdentifier());
self::assertEquals($result, $sut->vote($token, $subject, [$attribute]), 'Failed on permission "' . $attribute . '" for User ' . $user->getUserIdentifier());
}
public function getTestData()
public static function getTestData()
{
$user0 = $this->getUser(0, null);
$user1 = $this->getUser(1, User::ROLE_USER);
$user2 = $this->getUser(2, User::ROLE_TEAMLEAD);
$user3 = $this->getUser(3, User::ROLE_ADMIN);
$user4 = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$user0 = self::getUser(0, null);
$user1 = self::getUser(1, User::ROLE_USER);
$user2 = self::getUser(2, User::ROLE_TEAMLEAD);
$user3 = self::getUser(3, User::ROLE_ADMIN);
$user4 = self::getUser(4, User::ROLE_SUPER_ADMIN);
$result = VoterInterface::ACCESS_GRANTED;
$allPermissions = ['budget_money', 'budget_time', 'budget_any', 'details'];

16
tests/Voter/ProjectVoterTest.php
View File

@@ -20,7 +20,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\ProjectVoter
*/
class ProjectVoterTest extends AbstractVoterTest
class ProjectVoterTest extends AbstractVoterTestCase
{
public function assertVote(User $user, $subject, $attribute, $result): void
{
@@ -32,16 +32,16 @@ class ProjectVoterTest extends AbstractVoterTest
}
$actual = $sut->vote($token, $subject, [$attribute]);
$this->assertEquals($result, $actual, \sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
self::assertEquals($result, $actual, \sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
}
public function testVote(): void
{
$userNoRole = $this->getUser(0, 'foo');
$userStandard = $this->getUser(1, User::ROLE_USER);
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = $this->getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$userNoRole = self::getUser(0, 'foo');
$userStandard = self::getUser(1, User::ROLE_USER);
$userTeamlead = self::getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = self::getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = self::getUser(4, User::ROLE_SUPER_ADMIN);
$result = VoterInterface::ACCESS_GRANTED;
foreach ([$userAdmin, $userSuperAdmin] as $user) {
@@ -60,7 +60,7 @@ class ProjectVoterTest extends AbstractVoterTest
$team->removeProject($project);
}
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$userTeamlead = self::getUser(2, User::ROLE_TEAMLEAD);
$result = VoterInterface::ACCESS_DENIED;
foreach ([$userNoRole, $userStandard] as $user) {

16
tests/Voter/RolePermissionVoterTest.php
View File

@@ -18,7 +18,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\RolePermissionVoter
*/
class RolePermissionVoterTest extends AbstractVoterTest
class RolePermissionVoterTest extends AbstractVoterTestCase
{
/**
* @dataProvider getTestData
@@ -29,16 +29,16 @@ class RolePermissionVoterTest extends AbstractVoterTest
$sut = $this->getVoter(RolePermissionVoter::class);
$actual = $sut->vote($token, $subject, [$attribute]);
$this->assertEquals($result, $actual, \sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
self::assertEquals($result, $actual, \sprintf('Failed voting "%s" for User with roles %s.', $attribute, implode(', ', $user->getRoles())));
}
public function getTestData()
public static function getTestData()
{
$userNoRole = $this->getUser(0, 'foo');
$userStandard = $this->getUser(1, User::ROLE_USER);
$userTeamlead = $this->getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = $this->getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$userNoRole = self::getUser(0, 'foo');
$userStandard = self::getUser(1, User::ROLE_USER);
$userTeamlead = self::getUser(2, User::ROLE_TEAMLEAD);
$userAdmin = self::getUser(3, User::ROLE_ADMIN);
$userSuperAdmin = self::getUser(4, User::ROLE_SUPER_ADMIN);
$invoice = [
'manage_invoice_template' => null,

16
tests/Voter/TeamVoterTest.php
View File

@@ -18,7 +18,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\TeamVoter
*/
class TeamVoterTest extends AbstractVoterTest
class TeamVoterTest extends AbstractVoterTestCase
{
/**
* @dataProvider getTestData
@@ -28,16 +28,16 @@ class TeamVoterTest extends AbstractVoterTest
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(TeamVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
self::assertEquals($result, $sut->vote($token, $subject, [$attribute]));
}
public function getTestData()
public static function getTestData()
{
$user0 = $this->getUser(0, null);
$user1 = $this->getUser(1, User::ROLE_USER);
$user2 = $this->getUser(2, User::ROLE_TEAMLEAD);
$user3 = $this->getUser(3, User::ROLE_ADMIN);
$user4 = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$user0 = self::getUser(0, null);
$user1 = self::getUser(1, User::ROLE_USER);
$user2 = self::getUser(2, User::ROLE_TEAMLEAD);
$user3 = self::getUser(3, User::ROLE_ADMIN);
$user4 = self::getUser(4, User::ROLE_SUPER_ADMIN);
$team = new Team('foo');

15
tests/Voter/TimesheetVoterTest.php
View File

@@ -24,7 +24,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\TimesheetVoter
*/
class TimesheetVoterTest extends AbstractVoterTest
class TimesheetVoterTest extends AbstractVoterTestCase
{
protected function getVoter(string $voterClass): TimesheetVoter
{
@@ -36,15 +36,14 @@ class TimesheetVoterTest extends AbstractVoterTest
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(TimesheetVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
self::assertEquals($result, $sut->vote($token, $subject, [$attribute]));
}
/**
* @dataProvider getTestData
*/
public function testVote(User $user, $subject, $attribute, $result): void
public function testVote(): void
{
$this->assertVote($user, $subject, $attribute, $result);
foreach ($this->getTestData() as $row) {
$this->assertVote($row[0], $row[1], $row[2], $row[3]);
}
}
public function getTestData()
@@ -115,7 +114,7 @@ class TimesheetVoterTest extends AbstractVoterTest
self::assertEquals($expected, $sut->vote($token, $timesheet, [$permission]));
}
public function getLockDownTestData()
public static function getLockDownTestData()
{
yield ['view', VoterInterface::ACCESS_GRANTED, '+1 days', 'first day of this month', 'last day of this month', '+10 days'];
yield ['start', VoterInterface::ACCESS_DENIED, '+1 days', 'first day of this month', 'last day of this month', '+10 days'];

22
tests/Voter/UserVoterTest.php
View File

@@ -18,7 +18,7 @@ use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface;
/**
* @covers \App\Voter\UserVoter
*/
class UserVoterTest extends AbstractVoterTest
class UserVoterTest extends AbstractVoterTestCase
{
/**
* @dataProvider getTestData
@@ -28,16 +28,16 @@ class UserVoterTest extends AbstractVoterTest
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(UserVoter::class);
$this->assertEquals($result, $sut->vote($token, $subject, [$attribute]));
self::assertEquals($result, $sut->vote($token, $subject, [$attribute]));
}
public function getTestData()
public static function getTestData()
{
$user0 = $this->getUser(0, null);
$user1 = $this->getUser(1, User::ROLE_USER);
$user2 = $this->getUser(2, User::ROLE_TEAMLEAD);
$user3 = $this->getUser(3, User::ROLE_ADMIN);
$user4 = $this->getUser(4, User::ROLE_SUPER_ADMIN);
$user0 = self::getUser(0, null);
$user1 = self::getUser(1, User::ROLE_USER);
$user2 = self::getUser(2, User::ROLE_TEAMLEAD);
$user3 = self::getUser(3, User::ROLE_ADMIN);
$user4 = self::getUser(4, User::ROLE_SUPER_ADMIN);
$result = VoterInterface::ACCESS_GRANTED;
foreach ([$user1, $user2, $user3] as $user) {
@@ -103,7 +103,7 @@ class UserVoterTest extends AbstractVoterTest
$this->testVote($user, $subject, 'password', $result);
}
public function getTestDataForAuthType()
public static function getTestDataForAuthType()
{
return [
[User::AUTH_LDAP, VoterInterface::ACCESS_DENIED],
@@ -120,7 +120,7 @@ class UserVoterTest extends AbstractVoterTest
$token = new UsernamePasswordToken($user, 'bar', $user->getRoles());
$sut = $this->getVoter(UserVoter::class);
$this->assertEquals(VoterInterface::ACCESS_GRANTED, $sut->vote($token, $user, ['view_team_member']));
$this->assertEquals(VoterInterface::ACCESS_DENIED, $sut->vote($token, $userMock, ['view_team_member']));
self::assertEquals(VoterInterface::ACCESS_GRANTED, $sut->vote($token, $user, ['view_team_member']));
self::assertEquals(VoterInterface::ACCESS_DENIED, $sut->vote($token, $userMock, ['view_team_member']));
}
}