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

added global activities (#259)

Browse Source
This commit is contained in:
Kevin Papst
2018-11-06 23:10:34 +01:00
committed by GitHub
parent c66dfbc653
commit db7de3aac1
70 changed files with 1168 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Controller/Admin/TimesheetControllerTest.php
View File

@@ -80,7 +80,9 @@ class TimesheetControllerTest extends ControllerBaseTest
$form = $client->getCrawler()->filter('form[name=timesheet_edit_form]')->form();
$client->submit($form, [
'timesheet_edit_form' => [
'description' => 'Testing is fun!'
'description' => 'Testing is fun!',
'project' => 1,
'activity' => 1,
]
]);

14
tests/Controller/ControllerBaseTest.php
View File

@@ -81,11 +81,12 @@ abstract class ControllerBaseTest extends WebTestCase
* @param Client $client
* @param string $url
* @param string $method
* @param array $parameters
* @return \Symfony\Component\DomCrawler\Crawler
*/
protected function request(Client $client, string $url, $method = 'GET')
protected function request(Client $client, string $url, $method = 'GET', array $parameters = [])
{
return $client->request($method, $this->createUrl($url));
return $client->request($method, $this->createUrl($url), $parameters);
}
/**
@@ -140,13 +141,14 @@ abstract class ControllerBaseTest extends WebTestCase
/**
* @param Client $client
* @param string $url
* @param $url
* @param string $method
* @param array $parameters
*/
protected function assertAccessIsGranted(Client $client, $url)
protected function assertAccessIsGranted(Client $client, $url, $method = 'GET', array $parameters = [])
{
$this->request($client, $url);
$this->request($client, $url, $method, $parameters);
$this->assertTrue($client->getResponse()->isSuccessful());
// TODO improve this test?
}
/**

22
tests/Controller/TimesheetControllerTest.php
View File

@@ -111,7 +111,9 @@ class TimesheetControllerTest extends ControllerBaseTest
$form = $client->getCrawler()->filter('form[name=timesheet_edit_form]')->form();
$client->submit($form, [
'timesheet_edit_form' => [
'description' => 'Testing is fun!'
'description' => 'Testing is fun!',
'project' => 1,
'activity' => 1,
]
]);
@@ -157,7 +159,14 @@ class TimesheetControllerTest extends ControllerBaseTest
public function testStartAction()
{
$client = $this->getClientForAuthenticatedUser();
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setAmount(1);
$this->importFixture($em, $fixture);
$this->request($client, '/timesheet/start/1');
$this->assertIsRedirect($client, $this->createUrl('/timesheet/'));
@@ -167,10 +176,11 @@ class TimesheetControllerTest extends ControllerBaseTest
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$timesheet = $em->getRepository(Timesheet::class)->find(2);
$this->assertInstanceOf(\DateTime::class, $timesheet->getBegin());
$this->assertNull($timesheet->getEnd());
$this->assertEquals(1, $timesheet->getActivity()->getId());
$this->assertEquals(1, $timesheet->getProject()->getId());
}
public function testStopAction()
@@ -184,6 +194,8 @@ class TimesheetControllerTest extends ControllerBaseTest
'timesheet_edit_form' => [
'description' => 'Testing is fun!',
'fixedRate' => 100,
'project' => 1,
'activity' => 1,
]
]);
@@ -218,6 +230,8 @@ class TimesheetControllerTest extends ControllerBaseTest
$client->submit($form, [
'timesheet_edit_form' => [
'hourlyRate' => 100,
'project' => 1,
'activity' => 1,
]
]);
@@ -250,6 +264,8 @@ class TimesheetControllerTest extends ControllerBaseTest
$client->submit($form, [
'timesheet_edit_form' => [
'hourlyRate' => 100,
'project' => 1,
'activity' => 1,
]
]);