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

added account number field to user (#2671)

Browse Source
This commit is contained in:
Kevin Papst
2021-07-19 00:13:39 +02:00
committed by GitHub
parent 7d052eba00
commit 828b9c8b4a
12 changed files with 106 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/API/APIControllerBaseTest.php
View File

@@ -292,6 +292,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'enabled' => 'bool',
'color' => '@string',
'alias' => '@string',
'accountNumber' => '@string',
];
// if a user is loaded explicitly
@@ -308,6 +309,7 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
'roles' => ['result' => 'array', 'type' => 'string'],
'language' => 'string',
'timezone' => 'string',
'accountNumber' => '@string',
];
// if a team is embedded

5
tests/Entity/UserTest.php
View File

@@ -39,6 +39,7 @@ class UserTest extends TestCase
self::assertNull($user->getAvatar());
self::assertNull($user->getAlias());
self::assertNull($user->getId());
self::assertNull($user->getAccountNumber());
self::assertNull($user->getApiToken());
self::assertNull($user->getPlainApiToken());
self::assertNull($user->getPasswordRequestedAt());
@@ -59,6 +60,9 @@ class UserTest extends TestCase
$user->setTitle('Mr. Code Blaster');
self::assertEquals('Mr. Code Blaster', $user->getTitle());
$user->setAccountNumber('A-058375');
self::assertEquals('A-058375', $user->getAccountNumber());
}
public function testColor()
@@ -334,6 +338,7 @@ class UserTest extends TestCase
['profile.registration_date', 'datetime'],
['label.roles', 'array'],
['label.color', 'string'],
['label.account_number', 'string'],
];
self::assertCount(\count($expected), $columns);

6
tests/Export/Spreadsheet/UserExporterTest.php
View File

@@ -32,15 +32,18 @@ class UserExporterTest extends TestCase
$userPreferenceExtractor = new UserPreferenceExtractor($this->createMock(EventDispatcherInterface::class));
$user = new User();
$user->setAccountNumber('F-747864');
$user->setUsername('test user');
$user->setAvatar('Lorem Ipsum');
$user->setTimezone('Europe/Berlin');
$user->setColor('#ececec');
$user->setAlias('Another name');
$user->setTitle('Mr. Title');
$user->setLanguage('de');
$user->setEmail('test@example.com');
$user->setEnabled(false);
$user->addRole(User::ROLE_TEAMLEAD);
$date = $user->getRegisteredAt();
$sut = new UserExporter($spreadsheetExporter, $annotationExtractor, $userPreferenceExtractor);
$spreadsheet = $sut->export([$user], new UserPreferenceDisplayEvent(UserPreferenceDisplayEvent::EXPORT));
@@ -55,6 +58,9 @@ class UserExporterTest extends TestCase
self::assertEquals('de', $worksheet->getCellByColumnAndRow(7, 2)->getValue());
self::assertEquals('Europe/Berlin', $worksheet->getCellByColumnAndRow(8, 2)->getValue());
self::assertFalse($worksheet->getCellByColumnAndRow(9, 2)->getValue());
self::assertEquals($date->format('Y-m-d H:i'), $worksheet->getCellByColumnAndRow(10, 2)->getFormattedValue());
self::assertEquals('ROLE_TEAMLEAD;ROLE_USER', $worksheet->getCellByColumnAndRow(11, 2)->getValue());
self::assertEquals('#ececec', $worksheet->getCellByColumnAndRow(12, 2)->getValue());
self::assertEquals('F-747864', $worksheet->getCellByColumnAndRow(13, 2)->getValue());
}
}