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

added hourly and money budgets to activity, project and customer (#843)

Browse Source
This commit is contained in:
Kevin Papst
2019-06-11 13:18:57 +02:00
committed by GitHub
parent 833968a87d
commit 5702d7afa8
118 changed files with 1743 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/API/ActivityControllerTest.php
View File

@@ -223,7 +223,7 @@ class ActivityControllerTest extends APIControllerBaseTest
$expectedKeys = ['id', 'name', 'visible', 'project', 'hourlyRate', 'fixedRate', 'color'];
if ($full) {
$expectedKeys = array_merge($expectedKeys, ['comment']);
$expectedKeys = array_merge($expectedKeys, ['comment', 'budget', 'timeBudget']);
}
$actual = array_keys($result);

3
tests/API/CustomerControllerTest.php
View File

@@ -167,7 +167,8 @@ class CustomerControllerTest extends APIControllerBaseTest
if ($full) {
$expectedKeys = array_merge($expectedKeys, [
'homepage', 'number', 'comment', 'company', 'contact', 'address', 'country', 'currency', 'phone', 'fax', 'mobile', 'email', 'timezone'
'homepage', 'number', 'comment', 'company', 'contact', 'address', 'country', 'currency',
'phone', 'fax', 'mobile', 'email', 'timezone', 'budget', 'timeBudget'
]);
}

3
tests/API/ProjectControllerTest.php
View File

@@ -127,7 +127,6 @@ class ProjectControllerTest extends APIControllerBaseTest
'name' => 'foo',
'customer' => 1,
'visible' => true,
'budget' => 0,
];
$this->request($client, '/api/projects', 'POST', [], json_encode($data));
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -219,7 +218,7 @@ class ProjectControllerTest extends APIControllerBaseTest
if ($full) {
$expectedKeys = array_merge(
$expectedKeys,
['comment', 'budget', 'orderNumber']
['comment', 'budget', 'timeBudget', 'orderNumber']
);
}