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

fix timezone for timesheets created by other users (#1509)

Browse Source
This commit is contained in:
Kevin Papst
2020-11-13 17:46:32 +01:00
committed by GitHub
parent 7503899a9b
commit 288fc5dd08
3 changed files with 64 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
tests/Timesheet/TimesheetServiceTest.php
View File

@@ -11,6 +11,7 @@ namespace App\Tests\Timesheet;
use App\Configuration\TimesheetConfiguration;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Event\TimesheetCreatePostEvent;
use App\Event\TimesheetCreatePreEvent;
use App\Event\TimesheetDeleteMultiplePreEvent;
@@ -138,6 +139,50 @@ class TimesheetServiceTest extends TestCase
$sut->saveNewTimesheet($newTimesheet);
}
public function testSaveNewTimesheetFixesTimezone()
{
$user = new User();
$user->setTimezone('Europe/Paris');
$begin = new \DateTime('now', new \DateTimeZone('Africa/Casablanca'));
$timesheet = new Timesheet();
$timesheet->setBegin($begin);
self::assertEquals('Africa/Casablanca', $timesheet->getTimezone());
$timesheet->setUser($user);
self::assertEquals('Africa/Casablanca', $timesheet->getTimezone());
$authorizationChecker = $this->createMock(AuthorizationCheckerInterface::class);
$authorizationChecker->expects($this->once())->method('isGranted')->willReturn(true);
$sut = $this->getSut($authorizationChecker);
$sut->saveNewTimesheet($timesheet);
self::assertEquals('Europe/Paris', $timesheet->getTimezone());
}
public function testUpdateTimesheetFixesTimezone()
{
$user = new User();
$user->setTimezone('Europe/Paris');
$begin = new \DateTime('now', new \DateTimeZone('Africa/Casablanca'));
$timesheet = new Timesheet();
$timesheet->setBegin($begin);
self::assertEquals('Africa/Casablanca', $timesheet->getTimezone());
$timesheet->setUser($user);
self::assertEquals('Africa/Casablanca', $timesheet->getTimezone());
$sut = $this->getSut();
$sut->updateTimesheet($timesheet);
self::assertEquals('Europe/Paris', $timesheet->getTimezone());
}
public function testCannotRestartedPersistedTimesheet()
{
$timesheet = $this->createMock(Timesheet::class);