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

API fixes (#2766)

Browse Source
This commit is contained in:
Kevin Papst
2021-09-16 17:06:32 +02:00
committed by GitHub
parent 2536105ad0
commit f2eec4f315
9 changed files with 140 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/API/ActivityControllerTest.php
View File

@@ -91,6 +91,10 @@ class ActivityControllerTest extends APIControllerBaseTest
$this->assertUrlIsSecured('/api/activities');
}
/**
* @return array<Project|Activity>
* @throws \Exception
*/
protected function loadActivityTestData(): array
{
$em = $this->getEntityManager();
@@ -111,8 +115,8 @@ class ActivityControllerTest extends APIControllerBaseTest
$activity = (new Activity())->setName('second one')->setComment('2');
$em->persist($activity);
$activity = (new Activity())->setName('third one')->setComment('3')->setProject($project);
$em->persist($activity);
$activity1 = (new Activity())->setName('third one')->setComment('3')->setProject($project);
$em->persist($activity1);
$activity = (new Activity())->setName('fourth one')->setComment('4')->setProject($project2)->setVisible(false);
$em->persist($activity);
@@ -131,7 +135,7 @@ class ActivityControllerTest extends APIControllerBaseTest
$em->flush();
return [$project, $project2];
return [$project, $project2, $activity1];
}
/**
@@ -304,6 +308,29 @@ class ActivityControllerTest extends APIControllerBaseTest
$this->assertNotEmpty($result['id']);
}
public function testPatchActionWithNonGlobalActivity()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$imports = $this->loadActivityTestData();
$data = [
'name' => 'foo',
'comment' => '',
'visible' => true,
'project' => $imports[1]->getId(),
'budget' => '999',
'timeBudget' => '7200',
];
$this->request($client, '/api/activities/' . $imports[2]->getId(), 'PATCH', [], json_encode($data));
$this->assertTrue($client->getResponse()->isSuccessful());
$result = json_decode($client->getResponse()->getContent(), true);
$this->assertIsArray($result);
self::assertApiResponseTypeStructure('ActivityEntity', $result);
$this->assertNotEmpty($result['id']);
$this->assertEquals($imports[1]->getId(), $result['project']);
}
public function testPatchActionWithInvalidUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);