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

Release 2.17 (#4836)

Browse Source 
see https://github.com/kimai/kimai/pull/4836
This commit is contained in:
Kevin Papst
2024-05-19 17:42:03 +02:00
committed by GitHub
parent 5f7114e008
commit 0c445d1bc4
41 changed files with 318 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Controller/ActivityControllerTest.php
View File

@@ -81,7 +81,7 @@ class ActivityControllerTest extends ControllerBaseTest
$client->submit($form, [
'searchTerm' => 'feature:timetracking foo',
'visibility' => 1,
'pageSize' => 50,
'size' => 50,
'customers' => [1],
'projects' => [1],
'page' => 1,
@@ -125,7 +125,7 @@ class ActivityControllerTest extends ControllerBaseTest
$client->submit($form, [
'searchTerm' => 'feature:timetracking foo',
'visibility' => 1,
'pageSize' => 50,
'size' => 50,
'customers' => [1],
'projects' => [1],
'page' => 1,

17
tests/Controller/ContractControllerTest.php
View File

@@ -32,7 +32,20 @@ class ContractControllerTest extends ControllerBaseTest
self::assertEquals(0, $node->count());
}
public function testAdminCanChangeUser(): void
public function testTeamleadCanChangeUser(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
$this->assertAccessIsGranted($client, '/contract');
$content = $client->getResponse()->getContent();
self::assertNotFalse($content);
self::assertStringContainsString('No target hours have been configured', $content);
$node = $client->getCrawler()->filter('select#user');
self::assertEquals(1, $node->count());
$node = $client->getCrawler()->filter('a.alert-link');
self::assertEquals(0, $node->count());
}
public function testAdminCanConfigureUser(): void
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/contract');
@@ -41,5 +54,7 @@ class ContractControllerTest extends ControllerBaseTest
self::assertStringContainsString('No target hours have been configured', $content);
$node = $client->getCrawler()->filter('select#user');
self::assertEquals(1, $node->count());
$node = $client->getCrawler()->filter('a.alert-link');
self::assertEquals(1, $node->count());
}
}

4
tests/Controller/CustomerControllerTest.php
View File

@@ -86,7 +86,7 @@ class CustomerControllerTest extends ControllerBaseTest
$client->submit($form, [
'searchTerm' => 'feature:timetracking foo',
'visibility' => 1,
'pageSize' => 50,
'size' => 50,
'page' => 1,
]);
@@ -119,7 +119,7 @@ class CustomerControllerTest extends ControllerBaseTest
$client->submit($form, [
'searchTerm' => 'feature:timetracking foo',
'visibility' => 1,
'pageSize' => 50,
'size' => 50,
'page' => 1,
]);

2
tests/Controller/PermissionControllerTest.php
View File

@@ -34,7 +34,7 @@ class PermissionControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, '/admin/permissions');
$this->assertHasDataTable($client);
$this->assertDataTableRowCount($client, 'datatable_user_admin_permissions', 133);
$this->assertDataTableRowCount($client, 'datatable_user_admin_permissions', 134);
$this->assertPageActions($client, [
'create modal-ajax-form' => $this->createUrl('/admin/permissions/roles/create'),
]);

4
tests/Controller/ProjectControllerTest.php
View File

@@ -91,7 +91,7 @@ class ProjectControllerTest extends ControllerBaseTest
'searchTerm' => 'feature:timetracking foo',
'visibility' => 1,
'customers' => [1],
'pageSize' => 50,
'size' => 50,
'page' => 1,
]);
@@ -134,7 +134,7 @@ class ProjectControllerTest extends ControllerBaseTest
'searchTerm' => 'feature:timetracking foo',
'visibility' => 1,
'customers' => [1],
'pageSize' => 50,
'size' => 50,
'page' => 1,
]);

2
tests/Controller/TimesheetControllerTest.php
View File

@@ -71,7 +71,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$form = $client->getCrawler()->filter('form.searchform')->form();
$client->submit($form, [
'state' => 1,
'pageSize' => 25,
'size' => 25,
'daterange' => $dateRange,
'customers' => [1],
'projects' => [1],

2
tests/Controller/TimesheetTeamControllerTest.php
View File

@@ -72,7 +72,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$client->submit($form, [
'state' => 1,
'users' => [$user->getId()],
'pageSize' => 25,
'size' => 25,
'daterange' => $dateRange,
'customers' => [],
]);

4
tests/Controller/UserControllerTest.php
View File

@@ -55,7 +55,7 @@ class UserControllerTest extends ControllerBaseTest
'searchTerm' => 'hourly_rate:35 tony',
'role' => 'ROLE_TEAMLEAD',
'visibility' => 1,
'pageSize' => 50,
'size' => 50,
'page' => 1,
]);
@@ -89,7 +89,7 @@ class UserControllerTest extends ControllerBaseTest
'searchTerm' => 'hourly_rate:35 tony',
'role' => 'ROLE_TEAMLEAD',
'visibility' => 1,
'pageSize' => 50,
'size' => 50,
'page' => 1,
]);