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

fix deprecations (#2225)

Browse Source
This commit is contained in:
Kevin Papst
2020-12-27 20:47:09 +01:00
committed by GitHub
parent c1a54abc58
commit a5fdf81df5
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Controller/ControllerBaseTest.php
View File

@@ -28,12 +28,16 @@ abstract class ControllerBaseTest extends WebTestCase
public const DEFAULT_LANGUAGE = 'en';
protected function tearDown(): void
{
$this->clearConfigCache();
parent::tearDown();
}
protected function clearConfigCache()
{
/** @var ConfigurationRepository $repository */
$repository = static::$kernel->getContainer()->get(ConfigurationRepository::class);
$repository->clearCache();
parent::tearDown();
}
protected function getClientForAuthenticatedUser(string $role = User::ROLE_USER): HttpKernelBrowser

4
tests/Controller/TimesheetControllerTest.php
View File

@@ -320,8 +320,6 @@ class TimesheetControllerTest extends ControllerBaseTest
]
]);
$client = $this->getClientForAuthenticatedUser();
$begin = new \DateTime('2018-08-02T20:00:00');
$end = new \DateTime('2018-08-02T20:30:00');
@@ -331,7 +329,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$timesheet->setEnd($end);
});
$fixture->setAmount(1);
$fixture->setUser($this->getUserByRole(User::ROLE_USER));
$fixture->setUser($this->getUserByRole(User::ROLE_SUPER_ADMIN));
$this->importFixture($fixture);
// create a second entry that is overlapping - should fail due to the changed config above