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

22
tests/Controller/ActivityControllerTest.php
View File

@@ -9,11 +9,13 @@
namespace App\Tests\Controller;
use App\Entity\Activity;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Tests\DataFixtures\ActivityFixtures;
use App\Tests\DataFixtures\ProjectFixtures;
use App\Tests\DataFixtures\TimesheetFixtures;
use Doctrine\ORM\EntityManager;
/**
* @group integration
@@ -33,6 +35,23 @@ class ActivityControllerTest extends ControllerBaseTest
$this->assertHasDataTable($client);
}
public function testBudgetAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setActivities($em->getRepository(Activity::class)->findAll());
$fixture->setUser($this->getUserByRole($em, User::ROLE_ADMIN));
$this->importFixture($em, $fixture);
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/activity/1/budget');
self::assertHasProgressbar($client);
}
public function testCreateAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
@@ -62,6 +81,7 @@ class ActivityControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$fixture = new ProjectFixtures();
$fixture->setAmount(10);
@@ -158,6 +178,7 @@ class ActivityControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
@@ -197,6 +218,7 @@ class ActivityControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));

63
tests/Controller/ControllerBaseTest.php
View File

@@ -103,12 +103,12 @@ abstract class ControllerBaseTest extends WebTestCase
$response = $client->getResponse();
self::assertInstanceOf(RedirectResponse::class, $response);
$this->assertTrue(
self::assertTrue(
$response->isRedirect(),
sprintf('The secure URL %s is not protected.', $url)
);
$this->assertStringEndsWith(
self::assertStringEndsWith(
'/login',
$response->getTargetUrl(),
sprintf('The secure URL %s does not redirect to the login form.', $url)
@@ -134,7 +134,7 @@ abstract class ControllerBaseTest extends WebTestCase
{
$client = $this->getClientForAuthenticatedUser($role);
$client->request($method, $this->createUrl($url));
$this->assertFalse(
self::assertFalse(
$client->getResponse()->isSuccessful(),
sprintf('The secure URL %s is not protected for role %s', $url, $role)
);
@@ -143,11 +143,11 @@ abstract class ControllerBaseTest extends WebTestCase
protected function assertAccessDenied(Client $client)
{
$this->assertFalse(
self::assertFalse(
$client->getResponse()->isSuccessful(),
'Access is not denied for URL: ' . $client->getRequest()->getUri()
);
$this->assertContains(
self::assertContains(
'Symfony\Component\Security\Core\Exception\AccessDeniedException',
$client->getResponse()->getContent(),
'Could not find AccessDeniedException in response'
@@ -157,18 +157,18 @@ abstract class ControllerBaseTest extends WebTestCase
protected function assertAccessIsGranted(Client $client, string $url, string $method = 'GET', array $parameters = [])
{
$this->request($client, $url, $method, $parameters);
$this->assertTrue($client->getResponse()->isSuccessful());
self::assertTrue($client->getResponse()->isSuccessful());
}
protected function assertRouteNotFound(Client $client)
{
$this->assertFalse($client->getResponse()->isSuccessful());
$this->assertEquals(404, $client->getResponse()->getStatusCode());
self::assertFalse($client->getResponse()->isSuccessful());
self::assertEquals(404, $client->getResponse()->getStatusCode());
}
protected function assertMainContentClass(Client $client, string $classname)
{
$this->assertContains('<section class="content ' . $classname . '">', $client->getResponse()->getContent());
self::assertContains('<section class="content ' . $classname . '">', $client->getResponse()->getContent());
}
/**
@@ -176,7 +176,18 @@ abstract class ControllerBaseTest extends WebTestCase
*/
protected function assertHasDataTable(Client $client)
{
$this->assertContains('<table class="table table-striped table-hover dataTable" role="grid" data-reload-event="', $client->getResponse()->getContent());
self::assertContains('<table class="table table-striped table-hover dataTable" role="grid" data-reload-event="', $client->getResponse()->getContent());
}
/**
* @param Client $client
*/
protected static function assertHasProgressbar(Client $client)
{
$content = $client->getResponse()->getContent();
self::assertContains('<div class="progress-bar progress-bar-', $content);
self::assertContains('" role="progressbar" aria-valuenow="', $content);
self::assertContains('" aria-valuemin="0" aria-valuemax="100" style="width: ', $content);
}
/**
@@ -187,7 +198,7 @@ abstract class ControllerBaseTest extends WebTestCase
protected function assertDataTableRowCount(Client $client, string $id, int $count)
{
$node = $client->getCrawler()->filter('section.content div#' . $id . ' table.table-striped tbody tr');
$this->assertEquals($count, $node->count());
self::assertEquals($count, $node->count());
}
/**
@@ -197,13 +208,13 @@ abstract class ControllerBaseTest extends WebTestCase
protected function assertPageActions(Client $client, array $buttons)
{
$node = $client->getCrawler()->filter('section.content-header div.breadcrumb div.box-tools div.btn-group a.btn');
$this->assertEquals(count($buttons), $node->count());
self::assertEquals(count($buttons), $node->count());
foreach ($node->getIterator() as $element) {
$expectedClass = str_replace('btn btn-default btn-', '', $element->getAttribute('class'));
$this->assertArrayHasKey($expectedClass, $buttons);
self::assertArrayHasKey($expectedClass, $buttons);
$expectedUrl = $buttons[$expectedClass];
$this->assertEquals($expectedUrl, $element->getAttribute('href'));
self::assertEquals($expectedUrl, $element->getAttribute('href'));
}
}
@@ -228,7 +239,7 @@ abstract class ControllerBaseTest extends WebTestCase
$submittedForm = $result->filter($formSelector);
$validationErrors = $submittedForm->filter('li.text-danger');
$this->assertEquals(
self::assertEquals(
count($fieldNames),
count($validationErrors),
sprintf('Expected %s validation errors, found %s', count($fieldNames), count($validationErrors))
@@ -236,15 +247,15 @@ abstract class ControllerBaseTest extends WebTestCase
foreach ($fieldNames as $name) {
$field = $submittedForm->filter($name);
$this->assertNotNull($field, 'Could not find form field: ' . $name);
self::assertNotNull($field, 'Could not find form field: ' . $name);
$list = $field->nextAll();
$this->assertNotNull($list, 'Form field has no validation message: ' . $name);
self::assertNotNull($list, 'Form field has no validation message: ' . $name);
$validation = $list->filter('li.text-danger');
if (count($validation) < 1) {
// decorated form fields with icon have a different html structure, see kimai-theme.html.twig
$classes = $field->parents()->getNode(1)->getAttribute('class');
$this->assertContains('has-error', $classes, 'Form field has no validation message: ' . $name);
self::assertContains('has-error', $classes, 'Form field has no validation message: ' . $name);
}
}
}
@@ -264,7 +275,7 @@ abstract class ControllerBaseTest extends WebTestCase
protected function assertCalloutWidgetWithMessage(Client $client, string $message)
{
$node = $client->getCrawler()->filter('div.callout.callout-warning.lead');
$this->assertContains($message, $node->text());
self::assertContains($message, $node->text());
}
protected function assertHasFlashDeleteSuccess(Client $client)
@@ -284,9 +295,9 @@ abstract class ControllerBaseTest extends WebTestCase
protected function assertHasFlashSuccess(Client $client, string $message = null)
{
$node = $client->getCrawler()->filter('div.alert.alert-success.alert-dismissible');
$this->assertNotEmpty($node->text());
self::assertNotEmpty($node->text());
if (null !== $message) {
$this->assertContains($message, $node->text());
self::assertContains($message, $node->text());
}
}
@@ -297,9 +308,9 @@ abstract class ControllerBaseTest extends WebTestCase
protected function assertHasFlashError(Client $client, string $message = null)
{
$node = $client->getCrawler()->filter('div.alert.alert-error.alert-dismissible');
$this->assertNotEmpty($node->text());
self::assertNotEmpty($node->text());
if (null !== $message) {
$this->assertContains($message, $node->text());
self::assertContains($message, $node->text());
}
}
@@ -309,12 +320,12 @@ abstract class ControllerBaseTest extends WebTestCase
*/
protected function assertIsRedirect(Client $client, $url = null)
{
$this->assertTrue($client->getResponse()->isRedirect());
self::assertTrue($client->getResponse()->isRedirect());
if (null === $url) {
return;
}
$this->assertTrue($client->getResponse()->headers->has('Location'));
$this->assertStringEndsWith($url, $client->getResponse()->headers->get('Location'));
self::assertTrue($client->getResponse()->headers->has('Location'));
self::assertStringEndsWith($url, $client->getResponse()->headers->get('Location'));
}
}

19
tests/Controller/CustomerControllerTest.php
View File

@@ -9,10 +9,12 @@
namespace App\Tests\Controller;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Tests\DataFixtures\CustomerFixtures;
use App\Tests\DataFixtures\TimesheetFixtures;
use Doctrine\ORM\EntityManager;
/**
* @group integration
@@ -32,6 +34,23 @@ class CustomerControllerTest extends ControllerBaseTest
$this->assertHasDataTable($client);
}
public function testBudgetAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setProjects($em->getRepository(Project::class)->findAll());
$fixture->setUser($this->getUserByRole($em, User::ROLE_ADMIN));
$this->importFixture($em, $fixture);
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/customer/1/budget');
self::assertHasProgressbar($client);
}
public function testCreateAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);

19
tests/Controller/ProjectControllerTest.php
View File

@@ -9,11 +9,13 @@
namespace App\Tests\Controller;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use App\Tests\DataFixtures\CustomerFixtures;
use App\Tests\DataFixtures\ProjectFixtures;
use App\Tests\DataFixtures\TimesheetFixtures;
use Doctrine\ORM\EntityManager;
/**
* @group integration
@@ -33,6 +35,23 @@ class ProjectControllerTest extends ControllerBaseTest
$this->assertHasDataTable($client);
}
public function testBudgetAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
$em = $client->getContainer()->get('doctrine.orm.entity_manager');
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setProjects($em->getRepository(Project::class)->findAll());
$fixture->setUser($this->getUserByRole($em, User::ROLE_ADMIN));
$this->importFixture($em, $fixture);
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/project/1/budget');
self::assertHasProgressbar($client);
}
public function testCreateAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);

2
tests/Controller/UserControllerTest.php
View File

@@ -210,6 +210,6 @@ class UserControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->assertAccessIsGranted($client, '/admin/user/permissions');
$this->assertHasDataTable($client);
$this->assertDataTableRowCount($client, 'datatable_user_admin_permissions', 66);
$this->assertDataTableRowCount($client, 'datatable_user_admin_permissions', 69);
}
}