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

rounding rules via admin screen, round begin when starting record (#1229)

Browse Source
This commit is contained in:
Kevin Papst
2019-11-10 13:57:05 +01:00
committed by GitHub
parent fa1c79e15c
commit c6c4098759
47 changed files with 1100 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/DependencyInjection/AppExtensionTest.php
View File

@@ -129,7 +129,15 @@ class AppExtensionTest extends TestCase
'kimai.timesheet' => [
'mode' => 'default',
'markdown_content' => false,
'rounding' => [],
'rounding' => [
'default' => [
'begin' => 1,
'end' => 1,
'duration' => 0,
'mode' => 'default',
'days' => 'monday,tuesday,wednesday,thursday,friday,saturday,sunday'
]
],
'rates' => [],
'active_entries' => [
'soft_limit' => 1,
@@ -141,7 +149,15 @@ class AppExtensionTest extends TestCase
'default_begin' => 'now',
],
'kimai.timesheet.rates' => [],
'kimai.timesheet.rounding' => [],
'kimai.timesheet.rounding' => [
'default' => [
'begin' => 1,
'end' => 1,
'duration' => 0,
'mode' => 'default',
'days' => 'monday,tuesday,wednesday,thursday,friday,saturday,sunday'
]
],
'kimai.ldap' => [
'user' => [
'baseDn' => null,
@@ -240,7 +256,7 @@ class AppExtensionTest extends TestCase
public function testDurationOnlyDeprecationIsTriggered()
{
$this->expectException(Notice::class);
$this->expectExceptionMessage('Found ambiguous configuration. Please remove "kimai.timesheet.duration_only" and set "kimai.timesheet.mode" instead.');
$this->expectExceptionMessage('Found ambiguous configuration: remove "kimai.timesheet.duration_only" and set "kimai.timesheet.mode" instead.');
$minConfig = $this->getMinConfig();
$minConfig['kimai']['timesheet']['duration_only'] = true;