@@ -84,9 +85,9 @@
{% if entry.activity is not null %}{{ entry.activity.name }} / {% endif %}{{ entry.project.name }}
{% endif %}
-
{{ rate|money(model.calculator.currency) }}
+
{{ rate|money(currency) }}
{{ duration }}
-
{{ entry.rate|money(model.calculator.currency) }}
+
{{ entry.rate|money(currency) }}
{% endfor %}
@@ -94,15 +95,15 @@
{{ 'invoice.subtotal'|trans({}, 'messages', language) }}
- {{ model.calculator.subtotal|money(model.calculator.currency) }}
+ {{ model.calculator.subtotal|money(currency) }}
{{ 'invoice.tax'|trans({}, 'messages', language) }} ({{ model.calculator.vat }}%)
- {{ model.calculator.tax|money(model.calculator.currency) }}
+ {{ model.calculator.tax|money(currency) }}
{{ 'invoice.total'|trans({}, 'messages', language) }}
- {{ model.calculator.total|money(model.calculator.currency) }}
+ {{ model.calculator.total|money(currency) }}
diff --git a/templates/project/details.html.twig b/templates/project/details.html.twig
index c7730c0d..b701c9a8 100644
--- a/templates/project/details.html.twig
+++ b/templates/project/details.html.twig
@@ -99,64 +99,7 @@
{% endif %}
{% if can_edit %}
- {% embed '@AdminLTE/Widgets/box-widget.html.twig' %}
- {% import "macros/widgets.html.twig" as widgets %}
- {% block box_attributes %}id="project_rates_box"{% endblock %}
- {% block box_title %}
- {{ 'rates.title'|trans }}
- {% endblock %}
- {% block box_tools %}
-
- {% endblock %}
- {% block box_body %}
- {% if rates is empty %}
- {{ 'rates.empty'|trans }}
- {% else %}
-
-
-
-
- {{ 'label.user'|trans }}
-
-
- {{ 'label.hourlyRate'|trans }}
-
-
- {{ 'label.fixedRate'|trans }}
-
-
-
-
- {% for rate in rates %}
-
-
- {% if rate.user is not null %}
- {{ widgets.user_avatar(rate.user) }}
- {% else %}
- –
- {% endif %}
-
-
- {% if not rate.fixed %}
- {{ rate.rate|money(project.customer.currency) }}
- {% endif %}
-
-
- {% if rate.fixed %}
- {{ rate.rate|money(project.customer.currency) }}
- {% endif %}
-
-
-
-
- {% endfor %}
-
-
- {% endif %}
- {% endblock %}
- {% endembed %}
+ {{ include('embeds/rates-table.html.twig', {'id': 'project_rates_box', 'entity': project, 'create_url': path('admin_project_rate_add', {'id': project.id}), 'delete_route': 'delete_project_rate', 'currency': project.customer.currency}) }}
{% endif %}
{% if teams is not null%}
@@ -184,7 +127,7 @@
{{ parent() }}
{% endblock %}
diff --git a/templates/project/embed_budget.html.twig b/templates/project/embed_budget.html.twig
index 7de2fabd..41b8e0d9 100644
--- a/templates/project/embed_budget.html.twig
+++ b/templates/project/embed_budget.html.twig
@@ -10,12 +10,15 @@
'%activities%': '
' ~ stats.activityAmount ~ ' ',
'%duration%': '
' ~ stats.recordDuration|duration ~ ' '
} %}
-
+
+ {% set currency = project.customer.currency %}
+
{{ 'admin_project.short_stats'|trans(params)|raw }}
+ {{ 'label.rate_internal'|trans }}: {{ stats.recordInternalRate|money(currency) }}.
- {{ progress.progressbar(project.budget, stats.recordRate, 'label.budget'|trans, stats.recordRate|money(project.customer.currency) ~ ' / ' ~ project.budget|money(project.customer.currency) ) }}
+ {{ progress.progressbar(project.budget, stats.recordRate, 'label.budget'|trans, stats.recordRate|money(currency) ~ ' / ' ~ project.budget|money(currency) ) }}
{{ progress.progressbar(project.timeBudget, stats.recordDuration, 'label.timeBudget'|trans, stats.recordDuration|duration ~ ' / ' ~ project.timeBudget|duration ) }}
{% endblock %}
{% endembed %}
diff --git a/tests/API/APIControllerBaseTest.php b/tests/API/APIControllerBaseTest.php
index 5d0abfef..c5ab7983 100644
--- a/tests/API/APIControllerBaseTest.php
+++ b/tests/API/APIControllerBaseTest.php
@@ -149,6 +149,22 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
);
}
+ protected function assertNotFoundForDelete(HttpKernelBrowser $client, string $url)
+ {
+ return $this->assertExceptionForMethod($client, $url, 'DELETE', [], [
+ 'code' => 404,
+ 'message' => 'Not found'
+ ]);
+ }
+
+ protected function assertEntityNotFoundForDelete(string $role, string $url)
+ {
+ return $this->assertExceptionForDeleteAction($role, $url, [], [
+ 'code' => 404,
+ 'message' => 'Not found'
+ ]);
+ }
+
protected function assertEntityNotFoundForPatch(string $role, string $url, array $data)
{
return $this->assertExceptionForPatchAction($role, $url, $data, [
@@ -157,11 +173,32 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
]);
}
+ protected function assertEntityNotFoundForPost(string $role, string $url, array $data, ?string $message = null)
+ {
+ return $this->assertExceptionForPostAction($role, $url, $data, [
+ 'code' => 404,
+ 'message' => $message ?? 'Not found'
+ ]);
+ }
+
+ protected function assertExceptionForDeleteAction(string $role, string $url, array $data, array $expectedErrors)
+ {
+ $this->assertExceptionForRole($role, $url, 'DELETE', $data, $expectedErrors);
+ }
+
protected function assertExceptionForPatchAction(string $role, string $url, array $data, array $expectedErrors)
{
- $client = $this->getClientForAuthenticatedUser($role);
+ $this->assertExceptionForRole($role, $url, 'PATCH', $data, $expectedErrors);
+ }
- $this->request($client, $url, 'PATCH', [], json_encode($data));
+ protected function assertExceptionForPostAction(string $role, string $url, array $data, array $expectedErrors)
+ {
+ $this->assertExceptionForRole($role, $url, 'POST', $data, $expectedErrors);
+ }
+
+ protected function assertExceptionForMethod(HttpKernelBrowser $client, string $url, string $method, array $data, array $expectedErrors)
+ {
+ $this->request($client, $url, $method, [], json_encode($data));
$response = $client->getResponse();
self::assertFalse($response->isSuccessful());
@@ -173,25 +210,10 @@ abstract class APIControllerBaseTest extends ControllerBaseTest
);
}
- protected function assertEntityNotFoundForDelete(string $role, string $url, array $data)
+ protected function assertExceptionForRole(string $role, string $url, string $method, array $data, array $expectedErrors)
{
$client = $this->getClientForAuthenticatedUser($role);
-
- $this->request($client, $url, 'DELETE', [], json_encode($data));
- $response = $client->getResponse();
- self::assertFalse($response->isSuccessful());
-
- $expected = [
- 'code' => 404,
- 'message' => 'Not found'
- ];
-
- self::assertEquals(404, $client->getResponse()->getStatusCode());
-
- self::assertEquals(
- $expected,
- json_decode($client->getResponse()->getContent(), true)
- );
+ $this->assertExceptionForMethod($client, $url, $method, $data, $expectedErrors);
}
protected function assertApiException(Response $response, string $message)
diff --git a/tests/API/ActivityControllerTest.php b/tests/API/ActivityControllerTest.php
index 515092b5..661d616f 100644
--- a/tests/API/ActivityControllerTest.php
+++ b/tests/API/ActivityControllerTest.php
@@ -9,10 +9,14 @@
namespace App\Tests\API;
+use App\DataFixtures\UserFixtures;
use App\Entity\Activity;
+use App\Entity\ActivityRate;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\User;
+use App\Repository\ActivityRateRepository;
+use App\Repository\ActivityRepository;
use App\Tests\Mocks\ActivityTestMetaFieldSubscriberMock;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\HttpKernelBrowser;
@@ -22,6 +26,51 @@ use Symfony\Component\HttpKernel\HttpKernelBrowser;
*/
class ActivityControllerTest extends APIControllerBaseTest
{
+ use RateControllerTestTrait;
+
+ protected function getRateUrl(string $id = '1', ?string $rateId = null): string
+ {
+ if (null !== $rateId) {
+ return sprintf('/api/activities/%s/rates/%s', $id, $rateId);
+ }
+
+ return sprintf('/api/activities/%s/rates', $id);
+ }
+
+ protected function importTestRates(string $id): array
+ {
+ /** @var ActivityRateRepository $rateRepository */
+ $rateRepository = $this->getEntityManager()->getRepository(ActivityRate::class);
+ /** @var ActivityRepository $repository */
+ $repository = $this->getEntityManager()->getRepository(Activity::class);
+ /** @var Activity|null $activity */
+ $activity = $repository->find($id);
+
+ if (null === $activity) {
+ $activity = new Activity();
+ $activity->setName('foooo');
+ $repository->saveActivity($activity);
+ }
+
+ $rate1 = new ActivityRate();
+ $rate1->setActivity($activity);
+ $rate1->setRate(17.45);
+ $rate1->setIsFixed(false);
+
+ $rateRepository->saveRate($rate1);
+
+ $rate2 = new ActivityRate();
+ $rate2->setActivity($activity);
+ $rate2->setRate(99);
+ $rate2->setInternalRate(9);
+ $rate2->setIsFixed(true);
+ $rate2->setUser($this->getUserByName(UserFixtures::USERNAME_USER));
+
+ $rateRepository->saveRate($rate2);
+
+ return [$rate1, $rate2];
+ }
+
public function testIsSecure()
{
$this->assertUrlIsSecured('/api/activities');
@@ -29,9 +78,11 @@ class ActivityControllerTest extends APIControllerBaseTest
protected function loadActivityTestData(HttpKernelBrowser $client)
{
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
+ /** @var Project $project */
$project = $em->getRepository(Project::class)->find(1);
+ /** @var Customer $customer */
$customer = $em->getRepository(Customer::class)->find(1);
$project2 = new Project();
@@ -104,7 +155,6 @@ class ActivityControllerTest extends APIControllerBaseTest
$this->loadActivityTestData($client);
$query = ['order' => 'ASC', 'orderBy' => 'project'];
- $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/activities', 'GET', $query);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -277,7 +327,7 @@ class ActivityControllerTest extends APIControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Activity $activity */
$activity = $em->getRepository(Activity::class)->find(1);
$this->assertEquals('another,testing,bar', $activity->getMetaField('metatestmock')->getValue());
diff --git a/tests/API/CustomerControllerTest.php b/tests/API/CustomerControllerTest.php
index 2624e565..d97f9c51 100644
--- a/tests/API/CustomerControllerTest.php
+++ b/tests/API/CustomerControllerTest.php
@@ -9,8 +9,12 @@
namespace App\Tests\API;
+use App\DataFixtures\UserFixtures;
use App\Entity\Customer;
+use App\Entity\CustomerRate;
use App\Entity\User;
+use App\Repository\CustomerRateRepository;
+use App\Repository\CustomerRepository;
use App\Tests\Mocks\CustomerTestMetaFieldSubscriberMock;
use Symfony\Component\HttpFoundation\Response;
@@ -19,6 +23,53 @@ use Symfony\Component\HttpFoundation\Response;
*/
class CustomerControllerTest extends APIControllerBaseTest
{
+ use RateControllerTestTrait;
+
+ protected function getRateUrl(string $id = '1', ?string $rateId = null): string
+ {
+ if (null !== $rateId) {
+ return sprintf('/api/customers/%s/rates/%s', $id, $rateId);
+ }
+
+ return sprintf('/api/customers/%s/rates', $id);
+ }
+
+ protected function importTestRates(string $id): array
+ {
+ /** @var CustomerRateRepository $rateRepository */
+ $rateRepository = $this->getEntityManager()->getRepository(CustomerRate::class);
+ /** @var CustomerRepository $repository */
+ $repository = $this->getEntityManager()->getRepository(Customer::class);
+ /** @var Customer|null $customer */
+ $customer = $repository->find($id);
+
+ if (null === $customer) {
+ $customer = new Customer();
+ $customer->setCountry('DE');
+ $customer->setTimezone('Europre/Paris');
+ $customer->setName('foooo');
+ $repository->saveCustomer($customer);
+ }
+
+ $rate1 = new CustomerRate();
+ $rate1->setCustomer($customer);
+ $rate1->setRate(17.45);
+ $rate1->setIsFixed(false);
+
+ $rateRepository->saveRate($rate1);
+
+ $rate2 = new CustomerRate();
+ $rate2->setCustomer($customer);
+ $rate2->setRate(99);
+ $rate2->setInternalRate(9);
+ $rate2->setIsFixed(true);
+ $rate2->setUser($this->getUserByName(UserFixtures::USERNAME_USER));
+
+ $rateRepository->saveRate($rate2);
+
+ return [$rate1, $rate2];
+ }
+
public function testIsSecure()
{
$this->assertUrlIsSecured('/api/customers');
@@ -221,7 +272,7 @@ class CustomerControllerTest extends APIControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Customer $customer */
$customer = $em->getRepository(Customer::class)->find(1);
$this->assertEquals('another,testing,bar', $customer->getMetaField('metatestmock')->getValue());
diff --git a/tests/API/ProjectControllerTest.php b/tests/API/ProjectControllerTest.php
index e4b8a24b..f3473fc7 100644
--- a/tests/API/ProjectControllerTest.php
+++ b/tests/API/ProjectControllerTest.php
@@ -9,9 +9,13 @@
namespace App\Tests\API;
+use App\DataFixtures\UserFixtures;
use App\Entity\Customer;
use App\Entity\Project;
+use App\Entity\ProjectRate;
use App\Entity\User;
+use App\Repository\ProjectRateRepository;
+use App\Repository\ProjectRepository;
use App\Repository\Query\VisibilityInterface;
use App\Tests\Mocks\ProjectTestMetaFieldSubscriberMock;
use Symfony\Component\HttpFoundation\Response;
@@ -22,6 +26,52 @@ use Symfony\Component\HttpKernel\HttpKernelBrowser;
*/
class ProjectControllerTest extends APIControllerBaseTest
{
+ use RateControllerTestTrait;
+
+ protected function getRateUrl(string $id = '1', ?string $rateId = null): string
+ {
+ if (null !== $rateId) {
+ return sprintf('/api/projects/%s/rates/%s', $id, $rateId);
+ }
+
+ return sprintf('/api/projects/%s/rates', $id);
+ }
+
+ protected function importTestRates(string $id): array
+ {
+ /** @var ProjectRateRepository $rateRepository */
+ $rateRepository = $this->getEntityManager()->getRepository(ProjectRate::class);
+ /** @var ProjectRepository $repository */
+ $repository = $this->getEntityManager()->getRepository(Project::class);
+ /** @var Project|null $project */
+ $project = $repository->find($id);
+
+ if (null === $project) {
+ $project = new Project();
+ $project->setName('foooo');
+ $project->setCustomer($this->getEntityManager()->getRepository(Customer::class)->find(1));
+ $repository->saveProject($project);
+ }
+
+ $rate1 = new ProjectRate();
+ $rate1->setProject($project);
+ $rate1->setRate(17.45);
+ $rate1->setIsFixed(false);
+
+ $rateRepository->saveRate($rate1);
+
+ $rate2 = new ProjectRate();
+ $rate2->setProject($project);
+ $rate2->setRate(99);
+ $rate2->setInternalRate(9);
+ $rate2->setIsFixed(true);
+ $rate2->setUser($this->getUserByName(UserFixtures::USERNAME_USER));
+
+ $rateRepository->saveRate($rate2);
+
+ return [$rate1, $rate2];
+ }
+
public function testIsSecure()
{
$this->assertUrlIsSecured('/api/projects');
@@ -41,7 +91,7 @@ class ProjectControllerTest extends APIControllerBaseTest
protected function loadProjectTestData(HttpKernelBrowser $client)
{
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$customer = $em->getRepository(Customer::class)->find(1);
@@ -278,7 +328,7 @@ class ProjectControllerTest extends APIControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Project $project */
$project = $em->getRepository(Project::class)->find(1);
$this->assertEquals('another,testing,bar', $project->getMetaField('metatestmock')->getValue());
diff --git a/tests/API/RateControllerTestTrait.php b/tests/API/RateControllerTestTrait.php
new file mode 100644
index 00000000..1efab167
--- /dev/null
+++ b/tests/API/RateControllerTestTrait.php
@@ -0,0 +1,205 @@
+ 1,
+ 'rate' => 12.34,
+ 'internal_rate' => 6.66,
+ 'is_fixed' => false
+ ];
+ $this->assertEntityNotFoundForPost(User::ROLE_ADMIN, $this->getRateUrl(99), $data, 'Not found');
+ }
+
+ public function testAddRateMissingUserAction()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $data = [
+ 'user' => 33,
+ 'rate' => 12.34,
+ 'internal_rate' => 6.66,
+ 'is_fixed' => false
+ ];
+ $this->request($client, $this->getRateUrl(), 'POST', [], json_encode($data));
+
+ $response = $client->getResponse();
+ $this->assertEquals(400, $response->getStatusCode());
+ $this->assertApiCallValidationError($response, ['user']);
+ }
+
+ public function testAddRateActionWithInvalidUser()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $data = [
+ 'user' => null,
+ 'rate' => 12.34,
+ 'internal_rate' => 6.66,
+ 'is_fixed' => false
+ ];
+ $this->request($client, $this->getRateUrl(), 'POST', [], json_encode($data));
+ $response = $client->getResponse();
+ $this->assertFalse($response->isSuccessful());
+ $this->assertEquals(Response::HTTP_FORBIDDEN, $response->getStatusCode());
+ $json = json_decode($response->getContent(), true);
+ $this->assertEquals('Access denied.', $json['message']);
+ }
+
+ public function testAddRateAction()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $data = [
+ 'user' => null,
+ 'rate' => 12.34,
+ 'internal_rate' => 6.66,
+ 'is_fixed' => false
+ ];
+ $this->request($client, $this->getRateUrl(), 'POST', [], json_encode($data));
+ $this->assertTrue($client->getResponse()->isSuccessful());
+
+ $result = json_decode($client->getResponse()->getContent(), true);
+ $this->assertIsArray($result);
+ $this->assertRateStructure($result, null);
+ $this->assertNotEmpty($result['id']);
+ $this->assertEquals(12.34, $result['rate']);
+ $this->assertEquals(6.66, $result['internalRate']);
+ $this->assertFalse($result['isFixed']);
+ }
+
+ public function testAddFixedRateAction()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $data = [
+ 'user' => 1,
+ 'rate' => 12.34,
+ 'internal_rate' => 6.66,
+ 'is_fixed' => true
+ ];
+ $this->request($client, $this->getRateUrl(), 'POST', [], json_encode($data));
+ $this->assertTrue($client->getResponse()->isSuccessful());
+
+ $result = json_decode($client->getResponse()->getContent(), true);
+ $this->assertIsArray($result);
+ $this->assertRateStructure($result, 1);
+ $this->assertNotEmpty($result['id']);
+ $this->assertEquals(12.34, $result['rate']);
+ $this->assertEquals(6.66, $result['internalRate']);
+ $this->assertTrue($result['isFixed']);
+ }
+
+ public function testGetRatesEmptyResult()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $this->request($client, $this->getRateUrl(1));
+ $this->assertTrue($client->getResponse()->isSuccessful());
+
+ $result = json_decode($client->getResponse()->getContent(), true);
+ $this->assertIsArray($result);
+ $this->assertEmpty($result);
+ }
+
+ public function testGetRates()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $expectedRates = $this->importTestRates(1);
+
+ $this->request($client, $this->getRateUrl(1));
+ $this->assertTrue($client->getResponse()->isSuccessful());
+
+ $result = json_decode($client->getResponse()->getContent(), true);
+ $this->assertIsArray($result);
+ $this->assertNotEmpty($result);
+ $this->assertEquals(count($expectedRates), count($result));
+
+ foreach ($result as $rate) {
+ $this->assertRateStructure($rate, ($rate['user'] === null ? null : $rate['user']['id']));
+ }
+ }
+
+ public function testGetRatesEntityNotFound()
+ {
+ $this->assertEntityNotFound(User::ROLE_ADMIN, $this->getRateUrl(99));
+ }
+
+ public function testGetRatesIsSecured()
+ {
+ $this->assertUrlIsSecuredForRole(User::ROLE_USER, $this->getRateUrl(1));
+ }
+
+ public function testDeleteRate()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $expectedRates = $this->importTestRates(1);
+
+ $this->request($client, $this->getRateUrl(1, 1), 'DELETE');
+ $this->assertTrue($client->getResponse()->isSuccessful());
+ $this->assertEmpty($client->getResponse()->getContent());
+
+ // fetch rates to validate that one was removed
+ $this->request($client, $this->getRateUrl(1));
+ $this->assertTrue($client->getResponse()->isSuccessful());
+
+ $result = json_decode($client->getResponse()->getContent(), true);
+ $this->assertIsArray($result);
+ $this->assertEquals(count($expectedRates) - 1, count($result));
+ }
+
+ public function testDeleteRateEntityNotFound()
+ {
+ $this->assertEntityNotFoundForDelete(User::ROLE_ADMIN, $this->getRateUrl(99, 1));
+ }
+
+ public function testDeleteRateRateNotFound()
+ {
+ $this->assertEntityNotFoundForDelete(User::ROLE_ADMIN, $this->getRateUrl(1, 99));
+ }
+
+ public function testDeleteRateWithInvalidAssignment()
+ {
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $this->importTestRates(1);
+ $this->importTestRates(2);
+
+ $this->assertNotFoundForDelete($client, $this->getRateUrl(2, 1));
+ }
+
+ protected function assertRateStructure(array $result, $user = null)
+ {
+ $expectedKeys = [
+ 'id', 'rate', 'internalRate', 'isFixed', 'user'
+ ];
+
+ $actual = array_keys($result);
+ sort($actual);
+ sort($expectedKeys);
+
+ $this->assertEquals($expectedKeys, $actual, 'Rate structure does not match');
+
+ if (null !== $user) {
+ self::assertIsArray($result['user'], 'Rate user is not an array');
+ self::assertEquals($user, $result['user']['id'], 'Rate user does not match');
+ } else {
+ self::assertNull($result['user']);
+ }
+ }
+}
diff --git a/tests/API/StatusControllerTest.php b/tests/API/StatusControllerTest.php
index 5451d0b5..d1720444 100644
--- a/tests/API/StatusControllerTest.php
+++ b/tests/API/StatusControllerTest.php
@@ -17,9 +17,13 @@ use App\Entity\User;
*/
class StatusControllerTest extends APIControllerBaseTest
{
- public function testIsSecure()
+ public function testIsSecurePing()
{
$this->assertUrlIsSecured('/api/ping');
+ }
+
+ public function testIsSecureVersion()
+ {
$this->assertUrlIsSecured('/api/version');
}
diff --git a/tests/API/TagControllerTest.php b/tests/API/TagControllerTest.php
index 7badedda..5f528b66 100644
--- a/tests/API/TagControllerTest.php
+++ b/tests/API/TagControllerTest.php
@@ -12,16 +12,15 @@ namespace App\Tests\API;
use App\Entity\User;
use App\Tests\DataFixtures\TagFixtures;
use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\HttpKernelBrowser;
/**
* @group integration
*/
class TagControllerTest extends APIControllerBaseTest
{
- protected function setUp(): void
+ protected function importTagFixtures(HttpKernelBrowser $client): void
{
- $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
-
$tagList = ['Test', 'Administration', 'Support', '#2018-001', '#2018-002', '#2018-003', 'Development',
'Marketing', 'First Level Support', 'Bug Fixing'];
@@ -38,6 +37,7 @@ class TagControllerTest extends APIControllerBaseTest
public function testGetCollection()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importTagFixtures($client);
$this->assertAccessIsGranted($client, '/api/tags');
$result = json_decode($client->getResponse()->getContent(), true);
@@ -50,6 +50,7 @@ class TagControllerTest extends APIControllerBaseTest
public function testEmptyCollection()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importTagFixtures($client);
$query = ['name' => 'nothing'];
$this->assertAccessIsGranted($client, '/api/tags', 'GET', $query);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -62,6 +63,7 @@ class TagControllerTest extends APIControllerBaseTest
public function testPostAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $this->importTagFixtures($client);
$data = [
'name' => 'foo',
];
@@ -77,6 +79,7 @@ class TagControllerTest extends APIControllerBaseTest
public function testPostActionWithInvalidUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importTagFixtures($client);
$data = [
'name' => 'foo',
];
@@ -91,6 +94,7 @@ class TagControllerTest extends APIControllerBaseTest
public function testPartOfEntries()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importTagFixtures($client);
$query = ['name' => 'in'];
$this->assertAccessIsGranted($client, '/api/tags', 'GET', $query);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -107,6 +111,7 @@ class TagControllerTest extends APIControllerBaseTest
public function testDeleteAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $this->importTagFixtures($client);
$this->request($client, '/api/tags/1', 'DELETE');
$this->assertTrue($client->getResponse()->isSuccessful());
@@ -121,7 +126,7 @@ class TagControllerTest extends APIControllerBaseTest
public function testDeleteActionWithUnknownTimesheet()
{
- $this->assertEntityNotFoundForDelete(User::ROLE_ADMIN, '/api/tags/255', []);
+ $this->assertEntityNotFoundForDelete(User::ROLE_ADMIN, '/api/tags/255');
}
protected function assertStructure(array $result, $full = true)
diff --git a/tests/API/TeamControllerTest.php b/tests/API/TeamControllerTest.php
index e674bc77..0a8b35ba 100644
--- a/tests/API/TeamControllerTest.php
+++ b/tests/API/TeamControllerTest.php
@@ -31,8 +31,22 @@ class TeamControllerTest extends APIControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/api/teams');
- $this->assertUrlIsSecuredForRole(User::ROLE_USER, '/api/teams');
- $this->assertUrlIsSecuredForRole(User::ROLE_TEAMLEAD, '/api/teams');
+ }
+
+ public function getRoleTestData()
+ {
+ return [
+ [User::ROLE_USER],
+ [User::ROLE_TEAMLEAD],
+ ];
+ }
+
+ /**
+ * @dataProvider getRoleTestData
+ */
+ public function testIsSecureForRole(string $role)
+ {
+ $this->assertUrlIsSecuredForRole($role, '/api/teams');
}
public function testGetCollection()
@@ -66,7 +80,7 @@ class TeamControllerTest extends APIControllerBaseTest
public function testDeleteActionWithUnknownTeam()
{
- $this->assertEntityNotFoundForDelete(User::ROLE_ADMIN, '/api/teams/255', []);
+ $this->assertEntityNotFoundForDelete(User::ROLE_ADMIN, '/api/teams/255');
}
public function testPostAction()
@@ -142,8 +156,6 @@ class TeamControllerTest extends APIControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
self::assertEquals(Response::HTTP_NO_CONTENT, $client->getResponse()->getStatusCode());
$this->assertEmpty($client->getResponse()->getContent());
-
- $this->assertEntityNotFound(User::ROLE_ADMIN, '/api/teams/' . $id);
}
public function testPostMemberAction()
@@ -334,7 +346,7 @@ class TeamControllerTest extends APIControllerBaseTest
$customer->setVisible(false);
$customer->setCountry('DE');
$customer->setTimezone('Europe/Berlin');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$em->persist($customer);
$em->flush();
@@ -472,7 +484,7 @@ class TeamControllerTest extends APIControllerBaseTest
$project->setName('foooo');
$project->setVisible(false);
$project->setCustomer($customer);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$em->persist($customer);
$em->persist($project);
$em->flush();
diff --git a/tests/API/TimesheetControllerTest.php b/tests/API/TimesheetControllerTest.php
index 5d31c761..e8186280 100644
--- a/tests/API/TimesheetControllerTest.php
+++ b/tests/API/TimesheetControllerTest.php
@@ -19,7 +19,6 @@ use App\Entity\User;
use App\Tests\DataFixtures\TimesheetFixtures;
use App\Tests\Mocks\Security\UserDateTimeFactoryFactory;
use App\Tests\Mocks\TimesheetTestMetaFieldSubscriberMock;
-use App\Timesheet\UserDateTimeFactory;
use Symfony\Component\HttpFoundation\Response;
/**
@@ -31,21 +30,9 @@ class TimesheetControllerTest extends APIControllerBaseTest
public const DATE_FORMAT_HTML5 = 'Y-m-d\TH:i:s';
public const TEST_TIMEZONE = 'Europe/London';
- /**
- * @var UserDateTimeFactory
- */
- protected $dateTime;
-
- protected function setUp(): void
- {
- $this->importFixtureForUser(User::ROLE_USER);
- $this->dateTime = (new UserDateTimeFactoryFactory($this))->create(self::TEST_TIMEZONE);
- }
-
protected function importFixtureForUser(string $role)
{
- $client = $this->getClientForAuthenticatedUser($role);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture
@@ -56,7 +43,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
->setStartDate((new \DateTime('first day of this month'))->setTime(0, 0, 1))
->setAllowEmptyDescriptions(false)
;
- $this->importFixture($client, $fixture);
+ $this->importFixture($this, $fixture);
}
public function testIsSecure()
@@ -67,6 +54,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetCollection()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets');
$result = json_decode($client->getResponse()->getContent(), true);
@@ -79,6 +67,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetCollectionFull()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets', 'GET', ['full' => 'true']);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -92,7 +81,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetCollectionForOtherUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $this->importFixtureForUser(User::ROLE_USER);
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture
@@ -117,7 +107,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetCollectionForAllUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $this->importFixtureForUser(User::ROLE_USER);
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture
@@ -172,6 +163,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
];
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets', 'GET', $query);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -181,7 +173,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
$this->assertDefaultStructure($result[0], false);
}
- public function testGetCollectionWithDeprecatedQuery()
+ public function testGetCollectionWithSingleParamsQuery()
{
$begin = new \DateTime('first day of this month');
$begin->setTime(0, 0, 0);
@@ -203,6 +195,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
];
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets', 'GET', $query);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -215,7 +208,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testExportedFilter()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $this->importFixtureForUser(User::ROLE_USER);
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture
@@ -240,7 +234,6 @@ class TimesheetControllerTest extends APIControllerBaseTest
'exported' => 1,
];
- $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets', 'GET', $query);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -257,7 +250,6 @@ class TimesheetControllerTest extends APIControllerBaseTest
'exported' => 0,
];
- $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets', 'GET', $query);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -272,7 +264,6 @@ class TimesheetControllerTest extends APIControllerBaseTest
'begin' => $begin->format(self::DATE_FORMAT_HTML5),
'end' => $end->format(self::DATE_FORMAT_HTML5),
];
- $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets', 'GET', $query);
$result = json_decode($client->getResponse()->getContent(), true);
@@ -285,6 +276,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetEntity()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets/1');
$result = json_decode($client->getResponse()->getContent(), true);
@@ -294,15 +286,17 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetEntityAccessDenied()
{
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->importFixtureForUser(User::ROLE_ADMIN);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->assertApiAccessDenied($client, '/api/timesheets/15', 'You are not allowed to view this timesheet');
}
public function testGetEntityAccessAllowedForAdmin()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets/1');
$result = json_decode($client->getResponse()->getContent(), true);
@@ -317,12 +311,13 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testPostAction()
{
+ $dateTime = (new UserDateTimeFactoryFactory($this))->create(self::TEST_TIMEZONE);
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$data = [
'activity' => 1,
'project' => 1,
- 'begin' => ($this->dateTime->createDateTime('- 16 hours'))->format('Y-m-d H:m:0'),
- 'end' => ($this->dateTime->createDateTime())->format('Y-m-d H:m:0'),
+ 'begin' => ($dateTime->createDateTime('- 16 hours'))->format('Y-m-d H:m:0'),
+ 'end' => ($dateTime->createDateTime())->format('Y-m-d H:m:0'),
'description' => 'foo',
'fixedRate' => 2016,
'hourlyRate' => 127
@@ -344,7 +339,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$customer = (new Customer())->setName('foo-bar-1')->setVisible(false)->setCountry('DE')->setTimezone('Europe/Berlin');
$em->persist($customer);
$project = (new Project())->setName('foo-bar-2')->setVisible(true)->setCustomer($customer);
@@ -372,7 +367,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$customer = (new Customer())->setName('foo-bar-1')->setVisible(true)->setCountry('DE')->setTimezone('Europe/Berlin');
$em->persist($customer);
$project = (new Project())->setName('foo-bar-2')->setVisible(true)->setCustomer($customer);
@@ -396,12 +391,14 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testPatchAction()
{
+ $dateTime = (new UserDateTimeFactoryFactory($this))->create(self::TEST_TIMEZONE);
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
+ $this->importFixtureForUser(User::ROLE_USER);
$data = [
'activity' => 1,
'project' => 1,
- 'begin' => ($this->dateTime->createDateTime('- 7 hours'))->format('Y-m-d\TH:m:0'),
- 'end' => ($this->dateTime->createDateTime())->format('Y-m-d\TH:m:0'),
+ 'begin' => ($dateTime->createDateTime('- 7 hours'))->format('Y-m-d\TH:m:0'),
+ 'end' => ($dateTime->createDateTime())->format('Y-m-d\TH:m:0'),
'description' => 'foo',
'exported' => true,
];
@@ -419,7 +416,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testPatchActionWithInvalidUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $this->importFixtureForUser(User::ROLE_USER);
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture
@@ -456,6 +454,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testInvalidPatchAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
+
$data = [
'activity' => 10,
'project' => 1,
@@ -475,6 +475,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testDeleteAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->assertAccessIsGranted($client, '/api/timesheets/1');
$result = json_decode($client->getResponse()->getContent(), true);
@@ -487,32 +488,31 @@ class TimesheetControllerTest extends APIControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertEquals(Response::HTTP_NO_CONTENT, $client->getResponse()->getStatusCode());
$this->assertEmpty($client->getResponse()->getContent());
-
- $this->assertEntityNotFound(User::ROLE_USER, '/api/timesheets/' . $id);
}
public function testDeleteActionWithUnknownTimesheet()
{
- $this->assertEntityNotFoundForDelete(User::ROLE_ADMIN, '/api/timesheets/255', []);
+ $this->assertEntityNotFoundForDelete(User::ROLE_ADMIN, '/api/timesheets/255');
}
public function testDeleteActionForDifferentUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $this->importFixtureForUser(User::ROLE_USER);
+
$id = 1;
$this->request($client, '/api/timesheets/' . $id, 'DELETE');
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertEquals(Response::HTTP_NO_CONTENT, $client->getResponse()->getStatusCode());
$this->assertEmpty($client->getResponse()->getContent());
-
- $this->assertEntityNotFound(User::ROLE_USER, '/api/timesheets/' . $id);
}
public function testDeleteActionWithoutAuthorization()
{
- $this->importFixtureForUser(User::ROLE_ADMIN);
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_ADMIN);
$this->request($client, '/api/timesheets/15', 'DELETE');
@@ -526,8 +526,9 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testDeleteActionForExportedRecordIsNotAllowed()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$timesheet->setExported(true);
@@ -541,8 +542,9 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testDeleteActionForExportedRecordIsAllowedForAdmin()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $this->importFixtureForUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$timesheet->setExported(true);
@@ -556,7 +558,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetRecentCollectionWithSubresources()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$start = new \DateTime('-10 days');
@@ -589,7 +591,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testActiveAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$start = new \DateTime('-10 days');
@@ -617,7 +619,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testStopAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $this->importFixtureForUser(User::ROLE_USER);
+ $em = $this->getEntityManager();
$start = new \DateTime('-10 days');
@@ -635,7 +638,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
$this->request($client, '/api/timesheets/11/stop', 'PATCH');
$this->assertTrue($client->getResponse()->isSuccessful());
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$this->assertInstanceOf(\DateTime::class, $timesheet->getEnd());
@@ -644,6 +647,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testStopActionFailsOnStoppedEntry()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->request($client, '/api/timesheets/1/stop', 'PATCH');
$this->assertApiException($client->getResponse(), 'Timesheet entry already stopped');
@@ -657,7 +661,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testStopNotAllowedForUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $this->importFixtureForUser(User::ROLE_USER);
+ $em = $this->getEntityManager();
$start = new \DateTime('-10 days');
@@ -679,7 +684,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testGetCollectionWithTags()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $this->importFixtureForUser(User::ROLE_USER);
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture
@@ -724,6 +730,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testRestartAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$data = [
'description' => 'foo',
@@ -739,7 +746,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
$this->assertEmpty($result['description']);
$this->assertEmpty($result['tags']);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find($result['id']);
$this->assertInstanceOf(\DateTime::class, $timesheet->getBegin());
@@ -753,8 +760,9 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testRestartActionWithCopyData()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$timesheet->setDescription('foo');
@@ -779,7 +787,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
$this->assertEquals([['name' => 'sdfsdf', 'value' => 'nnnnn'], ['name' => '1234567890', 'value' => '1234567890']], $result['metaFields']);
$this->assertEquals(['another', 'testing', 'bar'], $result['tags']);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find($result['id']);
$this->assertInstanceOf(\DateTime::class, $timesheet->getBegin());
@@ -793,7 +801,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testRestartNotAllowedForUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+
+ $em = $this->getEntityManager();
$start = new \DateTime('-10 days');
@@ -808,7 +817,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
;
$this->importFixture($em, $fixture);
- $this->request($client, '/api/timesheets/12/restart', 'PATCH');
+ $this->request($client, '/api/timesheets/2/restart', 'PATCH');
$this->assertApiResponseAccessDenied($client->getResponse(), 'You are not allowed to re-start this timesheet');
}
@@ -819,12 +828,13 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testDuplicateAction()
{
+ $dateTime = (new UserDateTimeFactoryFactory($this))->create(self::TEST_TIMEZONE);
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$data = [
'activity' => 1,
'project' => 1,
- 'begin' => ($this->dateTime->createDateTime('- 16 hours'))->format('Y-m-d H:m:0'),
- 'end' => ($this->dateTime->createDateTime())->format('Y-m-d H:m:0'),
+ 'begin' => ($dateTime->createDateTime('- 16 hours'))->format('Y-m-d H:m:0'),
+ 'end' => ($dateTime->createDateTime())->format('Y-m-d H:m:0'),
'description' => 'foo',
'fixedRate' => 2016,
'hourlyRate' => 127
@@ -858,32 +868,34 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testExportAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
+ $this->importFixtureForUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
- $this->assertEquals(false, $timesheet->isExported());
+ $this->assertFalse($timesheet->isExported());
$this->request($client, '/api/timesheets/1/export', 'PATCH');
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertDefaultStructure(json_decode($client->getResponse()->getContent(), true), true);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em->clear();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
- $this->assertEquals(true, $timesheet->isExported());
+ $this->assertTrue($timesheet->isExported());
$this->request($client, '/api/timesheets/1/export', 'PATCH');
$this->assertTrue($client->getResponse()->isSuccessful());
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em->clear();
$timesheet = $em->getRepository(Timesheet::class)->find(1);
- $this->assertEquals(false, $timesheet->isExported());
+ $this->assertFalse($timesheet->isExported());
}
public function testExportNotAllowedForUser()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
$this->request($client, '/api/timesheets/1/export', 'PATCH');
$this->assertApiResponseAccessDenied($client->getResponse(), 'You are not allowed to lock this timesheet');
@@ -901,7 +913,10 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testMetaActionThrowsExceptionOnMissingName()
{
- return $this->assertExceptionForPatchAction(User::ROLE_ADMIN, '/api/timesheets/1/meta', ['value' => 'X'], [
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
+
+ return $this->assertExceptionForMethod($client, '/api/timesheets/1/meta', 'PATCH', ['value' => 'X'], [
'code' => 400,
'message' => 'Parameter "name" of value "NULL" violated a constraint "This value should not be null."'
]);
@@ -909,7 +924,10 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testMetaActionThrowsExceptionOnMissingValue()
{
- return $this->assertExceptionForPatchAction(User::ROLE_ADMIN, '/api/timesheets/1/meta', ['name' => 'X'], [
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
+
+ return $this->assertExceptionForMethod($client, '/api/timesheets/1/meta', 'PATCH', ['name' => 'X'], [
'code' => 400,
'message' => 'Parameter "value" of value "NULL" violated a constraint "This value should not be null."'
]);
@@ -917,7 +935,10 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testMetaActionThrowsExceptionOnMissingMetafield()
{
- return $this->assertExceptionForPatchAction(User::ROLE_ADMIN, '/api/timesheets/1/meta', ['name' => 'X', 'value' => 'Y'], [
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
+ $this->importFixtureForUser(User::ROLE_USER);
+
+ return $this->assertExceptionForMethod($client, '/api/timesheets/1/meta', 'PATCH', ['name' => 'X', 'value' => 'Y'], [
'code' => 500,
'message' => 'Unknown meta-field requested'
]);
@@ -926,7 +947,8 @@ class TimesheetControllerTest extends APIControllerBaseTest
public function testMetaAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- static::$kernel->getContainer()->get('event_dispatcher')->addSubscriber(new TimesheetTestMetaFieldSubscriberMock());
+ $this->importFixtureForUser(User::ROLE_USER);
+ static::$container->get('event_dispatcher')->addSubscriber(new TimesheetTestMetaFieldSubscriberMock());
$data = [
'name' => 'metatestmock',
@@ -936,7 +958,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$this->assertEquals('another,testing,bar', $timesheet->getMetaField('metatestmock')->getValue());
@@ -945,7 +967,7 @@ class TimesheetControllerTest extends APIControllerBaseTest
protected function assertDefaultStructure(array $result, $full = true)
{
$expectedKeys = [
- 'id', 'begin', 'end', 'duration', 'description', 'rate', 'activity', 'project', 'tags', 'user', 'metaFields'
+ 'id', 'begin', 'end', 'duration', 'description', 'rate', 'activity', 'project', 'tags', 'user', 'metaFields', 'internalRate'
];
if ($full) {
diff --git a/tests/API/UserControllerTest.php b/tests/API/UserControllerTest.php
index 64c73982..b8741b31 100644
--- a/tests/API/UserControllerTest.php
+++ b/tests/API/UserControllerTest.php
@@ -20,9 +20,23 @@ class UserControllerTest extends APIControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/api/users');
- $this->assertUrlIsSecuredForRole(User::ROLE_USER, '/api/users');
- $this->assertUrlIsSecuredForRole(User::ROLE_TEAMLEAD, '/api/users');
- $this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/api/users');
+ }
+
+ public function getRoleTestData()
+ {
+ return [
+ [User::ROLE_USER],
+ [User::ROLE_TEAMLEAD],
+ [User::ROLE_ADMIN],
+ ];
+ }
+
+ /**
+ * @dataProvider getRoleTestData
+ */
+ public function testIsSecureForRole(string $role)
+ {
+ $this->assertUrlIsSecuredForRole($role, '/api/users');
}
public function testGetCollection()
@@ -187,7 +201,6 @@ class UserControllerTest extends APIControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$result = json_decode($client->getResponse()->getContent(), true);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$data = [
'avatar' => 'test321',
'title' => 'qwertzui',
diff --git a/tests/Command/InvoiceCreateCommandTest.php b/tests/Command/InvoiceCreateCommandTest.php
index e7343bda..59a8d509 100644
--- a/tests/Command/InvoiceCreateCommandTest.php
+++ b/tests/Command/InvoiceCreateCommandTest.php
@@ -179,7 +179,7 @@ class InvoiceCreateCommandTest extends KernelTestCase
protected function prepareFixtures(\DateTime $start)
{
- $em = self::$container->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new CustomerFixtures();
$fixture->setAmount(1);
@@ -197,7 +197,7 @@ class InvoiceCreateCommandTest extends KernelTestCase
$this->importFixture($em, $fixture);
$fixture = new TimesheetFixtures();
- $fixture->setUser($this->getUserByName($em, UserFixtures::USERNAME_SUPER_ADMIN));
+ $fixture->setUser($this->getUserByName(UserFixtures::USERNAME_SUPER_ADMIN));
$fixture->setAmount(20);
$fixture->setStartDate($start);
$fixture->setProjects([$em->getRepository(Project::class)->find(2)]);
diff --git a/tests/Controller/ActivityControllerTest.php b/tests/Controller/ActivityControllerTest.php
index cad26821..04fbff05 100644
--- a/tests/Controller/ActivityControllerTest.php
+++ b/tests/Controller/ActivityControllerTest.php
@@ -28,6 +28,10 @@ class ActivityControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/activity/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_USER, '/admin/activity/');
}
@@ -52,7 +56,6 @@ class ActivityControllerTest extends ControllerBaseTest
});
$this->importFixture($client, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/activity/');
$form = $client->getCrawler()->filter('form.header-search')->form();
@@ -74,7 +77,7 @@ class ActivityControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
@@ -88,7 +91,6 @@ class ActivityControllerTest extends ControllerBaseTest
$fixture->setProjects([$project]);
$this->importFixture($client, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/activity/1/details');
self::assertHasProgressbar($client);
@@ -120,34 +122,6 @@ class ActivityControllerTest extends ControllerBaseTest
self::assertStringContainsString('123.45', $node->text(null, true));
}
- public function testDeleteRateAction()
- {
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $this->assertAccessIsGranted($client, '/admin/activity/1/rate');
- $form = $client->getCrawler()->filter('form[name=activity_rate_form]')->form();
- $client->submit($form, [
- 'activity_rate_form' => [
- 'user' => null,
- 'rate' => 123.45,
- ]
- ]);
- $this->assertIsRedirect($client, $this->createUrl('/admin/activity/1/details'));
- $client->followRedirect();
- $node = $client->getCrawler()->filter('div.box#activity_rates_box');
- self::assertEquals(1, $node->count());
- $node = $client->getCrawler()->filter('div.box#activity_rates_box table.dataTable tbody tr:not(.summary)');
- self::assertEquals(1, $node->count());
- self::assertStringContainsString('123.45', $node->text(null, true));
-
- $node = $client->getCrawler()->filter('div.box#activity_rates_box table.dataTable tbody tr td.actions a');
- self::assertEquals(1, $node->count());
- $url = $node->attr('href');
- $client->request('GET', $url);
- $this->assertIsRedirect($client, $this->createUrl('/admin/activity/1/details'));
- $node = $client->getCrawler()->filter('div.box#activity_rates_box table.dataTable tbody tr:not(.summary)');
- self::assertEquals(0, $node->count());
- }
-
public function testCreateAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
@@ -285,7 +259,7 @@ class ActivityControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
@@ -326,7 +300,7 @@ class ActivityControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
diff --git a/tests/Controller/CustomerControllerTest.php b/tests/Controller/CustomerControllerTest.php
index 5a5483f6..ac78e80c 100644
--- a/tests/Controller/CustomerControllerTest.php
+++ b/tests/Controller/CustomerControllerTest.php
@@ -29,6 +29,10 @@ class CustomerControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/customer/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_USER, '/admin/customer/');
}
@@ -53,7 +57,6 @@ class CustomerControllerTest extends ControllerBaseTest
});
$this->importFixture($client, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/customer/');
$form = $client->getCrawler()->filter('form.header-search')->form();
@@ -111,34 +114,6 @@ class CustomerControllerTest extends ControllerBaseTest
self::assertStringContainsString('123.45', $node->text(null, true));
}
- public function testDeleteRateAction()
- {
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $this->assertAccessIsGranted($client, '/admin/customer/1/rate');
- $form = $client->getCrawler()->filter('form[name=customer_rate_form]')->form();
- $client->submit($form, [
- 'customer_rate_form' => [
- 'user' => null,
- 'rate' => 123.45,
- ]
- ]);
- $this->assertIsRedirect($client, $this->createUrl('/admin/customer/1/details'));
- $client->followRedirect();
- $node = $client->getCrawler()->filter('div.box#customer_rates_box');
- self::assertEquals(1, $node->count());
- $node = $client->getCrawler()->filter('div.box#customer_rates_box table.dataTable tbody tr:not(.summary)');
- self::assertEquals(1, $node->count());
- self::assertStringContainsString('123.45', $node->text(null, true));
-
- $node = $client->getCrawler()->filter('div.box#customer_rates_box table.dataTable tbody tr td.actions a');
- self::assertEquals(1, $node->count());
- $url = $node->attr('href');
- $client->request('GET', $url);
- $this->assertIsRedirect($client, $this->createUrl('/admin/customer/1/details'));
- $node = $client->getCrawler()->filter('div.box#customer_rates_box table.dataTable tbody tr:not(.summary)');
- self::assertEquals(0, $node->count());
- }
-
public function testAddCommentAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
@@ -172,7 +147,6 @@ class CustomerControllerTest extends ControllerBaseTest
$node = $client->getCrawler()->filter('div.box#comments_box .box-comment a.confirmation-link');
self::assertEquals($this->createUrl('/admin/customer/1/comment_delete'), $node->attr('href'));
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->request($client, '/admin/customer/1/comment_delete');
$this->assertIsRedirect($client, $this->createUrl('/admin/customer/1/details'));
$client->followRedirect();
@@ -197,7 +171,6 @@ class CustomerControllerTest extends ControllerBaseTest
$node = $client->getCrawler()->filter('div.box#comments_box .box-comment a.btn.active');
self::assertEquals(0, $node->count());
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->request($client, '/admin/customer/1/comment_pin');
$this->assertIsRedirect($client, $this->createUrl('/admin/customer/1/details'));
$client->followRedirect();
@@ -213,7 +186,6 @@ class CustomerControllerTest extends ControllerBaseTest
$node = $client->getCrawler()->filter('div.box#team_listing_box .box-body');
self::assertStringContainsString('Visible to everyone, as no team was assigned yet.', $node->text(null, true));
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->request($client, '/admin/customer/1/create_team');
$this->assertIsRedirect($client, $this->createUrl('/admin/customer/1/details'));
$client->followRedirect();
@@ -231,7 +203,7 @@ class CustomerControllerTest extends ControllerBaseTest
self::assertEquals(1, $node->count());
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$customer = $em->getRepository(Customer::class)->find(1);
$fixture = new ProjectFixtures();
@@ -239,7 +211,6 @@ class CustomerControllerTest extends ControllerBaseTest
$fixture->setCustomers([$customer]);
$this->importFixture($client, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/customer/1/projects/1');
$node = $client->getCrawler()->filter('div.box#project_list_box .box-tools ul.pagination li');
@@ -309,7 +280,7 @@ class CustomerControllerTest extends ControllerBaseTest
public function testTeamPermissionAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Customer $customer */
$customer = $em->getRepository(Customer::class)->find(1);
@@ -368,7 +339,7 @@ class CustomerControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setAmount(10);
@@ -407,7 +378,7 @@ class CustomerControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setAmount(10);
diff --git a/tests/Controller/DoctorControllerTest.php b/tests/Controller/DoctorControllerTest.php
index 5e181f13..1fa40970 100644
--- a/tests/Controller/DoctorControllerTest.php
+++ b/tests/Controller/DoctorControllerTest.php
@@ -19,6 +19,10 @@ class DoctorControllerTest extends ControllerBaseTest
public function testDoctorIsSecure()
{
$this->assertUrlIsSecured('/doctor');
+ }
+
+ public function testDoctorIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/doctor');
}
diff --git a/tests/Controller/ExportControllerTest.php b/tests/Controller/ExportControllerTest.php
index 9c3d29ac..b2adedca 100644
--- a/tests/Controller/ExportControllerTest.php
+++ b/tests/Controller/ExportControllerTest.php
@@ -23,6 +23,10 @@ class ExportControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/export/');
+ }
+
+ public function testIsSecureForrole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_USER, '/export/');
}
@@ -39,7 +43,7 @@ class ExportControllerTest extends ControllerBaseTest
public function testIndexActionWithEntriesAndTeams()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$teamlead = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$user = $this->getUserByRole($em, User::ROLE_USER);
@@ -88,7 +92,7 @@ class ExportControllerTest extends ControllerBaseTest
$this->assertDataTableRowCount($client, 'datatable_export', 23);
// assert export type buttons are available
- $expected = ['csv', 'default.html.twig', 'default-budget.pdf.twig', 'default.pdf.twig', 'xlsx'];
+ $expected = ['csv', 'default.html.twig', 'default-budget.pdf.twig', 'default-internal.pdf.twig', 'default.pdf.twig', 'xlsx'];
$node = $client->getCrawler()->filter('#export-buttons .startExportBtn');
$this->assertEquals(count($expected), $node->count());
/** @var \DOMElement $button */
@@ -101,7 +105,7 @@ class ExportControllerTest extends ControllerBaseTest
public function testIndexActionWithEntriesForTeamleadDoesNotShowUserWithoutTeam()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$begin = new \DateTime('first day of this month');
$user = $this->getUserByRole($em, User::ROLE_USER);
@@ -140,7 +144,7 @@ class ExportControllerTest extends ControllerBaseTest
$this->assertDataTableRowCount($client, 'datatable_export', 3);
// assert export type buttons are available
- $expected = ['csv', 'default.html.twig', 'default-budget.pdf.twig', 'default.pdf.twig', 'xlsx'];
+ $expected = ['csv', 'default.html.twig', 'default-budget.pdf.twig', 'default-internal.pdf.twig', 'default.pdf.twig', 'xlsx'];
$node = $client->getCrawler()->filter('#export-buttons .startExportBtn');
$this->assertEquals(count($expected), $node->count());
/** @var \DOMElement $button */
@@ -187,7 +191,7 @@ class ExportControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$begin = new \DateTime('first day of this month');
$fixture = new TimesheetFixtures();
diff --git a/tests/Controller/HomepageControllerTest.php b/tests/Controller/HomepageControllerTest.php
index ee2fb596..25b823c4 100644
--- a/tests/Controller/HomepageControllerTest.php
+++ b/tests/Controller/HomepageControllerTest.php
@@ -35,7 +35,7 @@ class HomepageControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$pref = (new UserPreference())
diff --git a/tests/Controller/InvoiceControllerTest.php b/tests/Controller/InvoiceControllerTest.php
index 4f706ea3..7dcba0c1 100644
--- a/tests/Controller/InvoiceControllerTest.php
+++ b/tests/Controller/InvoiceControllerTest.php
@@ -50,6 +50,10 @@ class InvoiceControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/invoice/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_USER, '/invoice/');
}
@@ -113,7 +117,7 @@ class InvoiceControllerTest extends ControllerBaseTest
public function testCopyTemplateAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
@@ -141,7 +145,7 @@ class InvoiceControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
@@ -207,7 +211,7 @@ class InvoiceControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
@@ -266,7 +270,7 @@ class InvoiceControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
@@ -378,7 +382,7 @@ class InvoiceControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
@@ -396,7 +400,7 @@ class InvoiceControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new InvoiceFixtures();
$this->importFixture($client, $fixture);
diff --git a/tests/Controller/LayoutControllerTest.php b/tests/Controller/LayoutControllerTest.php
index bd40d69b..a12f8566 100644
--- a/tests/Controller/LayoutControllerTest.php
+++ b/tests/Controller/LayoutControllerTest.php
@@ -21,7 +21,7 @@ class LayoutControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$this->request($client, '/dashboard/');
@@ -77,7 +77,7 @@ class LayoutControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$this->request($client, '/layou/active_entries');
diff --git a/tests/Controller/PermissionControllerTest.php b/tests/Controller/PermissionControllerTest.php
index bff62694..244587be 100644
--- a/tests/Controller/PermissionControllerTest.php
+++ b/tests/Controller/PermissionControllerTest.php
@@ -11,16 +11,19 @@ namespace App\Tests\Controller;
use App\Entity\RolePermission;
use App\Entity\User;
-use Doctrine\ORM\EntityManager;
/**
* @group integration
*/
class PermissionControllerTest extends ControllerBaseTest
{
- public function testPermissionsIsSecure()
+ public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/permissions');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/permissions');
}
@@ -47,6 +50,10 @@ class PermissionControllerTest extends ControllerBaseTest
public function testCreateRoleIsSecured()
{
$this->assertUrlIsSecured('/admin/permissions/roles/create');
+ }
+
+ public function testCreateRoleIsSecuredForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/permissions');
}
@@ -75,6 +82,10 @@ class PermissionControllerTest extends ControllerBaseTest
public function testDeleteRoleIsSecured()
{
$this->assertUrlIsSecured('/admin/permissions/roles/1/delete');
+ }
+
+ public function testDeleteRoleIsSecuredForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/permissions');
}
@@ -106,6 +117,10 @@ class PermissionControllerTest extends ControllerBaseTest
public function testSavePermissionIsSecured()
{
$this->assertUrlIsSecured('/admin/permissions/roles/1/view_user/1');
+ }
+
+ public function testSavePermissionIsSecuredForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/permissions');
}
@@ -121,8 +136,7 @@ class PermissionControllerTest extends ControllerBaseTest
]);
$this->assertIsRedirect($client, $this->createUrl('/admin/permissions'));
- /** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$rolePermissions = $em->getRepository(RolePermission::class)->findAll();
$this->assertEquals(0, count($rolePermissions));
diff --git a/tests/Controller/PluginControllerTest.php b/tests/Controller/PluginControllerTest.php
index a505313d..cd95e5d3 100644
--- a/tests/Controller/PluginControllerTest.php
+++ b/tests/Controller/PluginControllerTest.php
@@ -21,6 +21,10 @@ class PluginControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/plugins/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/plugins/');
}
diff --git a/tests/Controller/ProfileControllerTest.php b/tests/Controller/ProfileControllerTest.php
index cbb112ac..08da5a18 100644
--- a/tests/Controller/ProfileControllerTest.php
+++ b/tests/Controller/ProfileControllerTest.php
@@ -48,7 +48,7 @@ class ProfileControllerTest extends ControllerBaseTest
new \DateTime('-1 year'),
];
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
foreach ($dates as $start) {
$fixture = new TimesheetFixtures();
@@ -133,7 +133,7 @@ class ProfileControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->request($client, '/profile/' . UserFixtures::USERNAME_USER . '/edit');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
@@ -160,7 +160,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$this->assertEquals(UserFixtures::USERNAME_USER, $user->getUsername());
@@ -193,7 +193,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$this->assertEquals(UserFixtures::USERNAME_USER, $user->getUsername());
@@ -209,7 +209,7 @@ class ProfileControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->request($client, '/profile/' . UserFixtures::USERNAME_USER . '/password');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
@@ -236,7 +236,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$this->assertFalse($passwordEncoder->getEncoder($user)->isPasswordValid($user->getPassword(), UserFixtures::DEFAULT_PASSWORD, $user->getSalt()));
@@ -248,7 +248,7 @@ class ProfileControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$this->request($client, '/profile/' . UserFixtures::USERNAME_USER . '/api-token');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
/** @var EncoderFactoryInterface $passwordEncoder */
@@ -274,7 +274,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$this->assertFalse($passwordEncoder->getEncoder($user)->isPasswordValid($user->getApiToken(), UserFixtures::DEFAULT_API_TOKEN, $user->getSalt()));
@@ -293,7 +293,7 @@ class ProfileControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
$this->request($client, '/profile/' . UserFixtures::USERNAME_USER . '/roles');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
@@ -313,7 +313,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$this->assertEquals(['ROLE_TEAMLEAD', 'ROLE_SUPER_ADMIN', 'ROLE_USER'], $user->getRoles());
@@ -322,13 +322,17 @@ class ProfileControllerTest extends ControllerBaseTest
public function testTeamsActionIsSecured()
{
$this->assertUrlIsSecured('/profile/' . UserFixtures::USERNAME_USER . '/teams');
+ }
+
+ public function testTeamsActionIsSecuredForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_TEAMLEAD, '/profile/' . UserFixtures::USERNAME_USER . '/teams');
}
public function testTeamsAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var User $user */
$user = $this->getUserByRole($em, User::ROLE_USER);
@@ -359,7 +363,7 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$this->assertEquals(1, $user->getTeams()->count());
@@ -369,27 +373,27 @@ class ProfileControllerTest extends ControllerBaseTest
{
return [
// assert that the user doesn't have the "hourly-rate_own_profile" permission
- [User::ROLE_USER, UserFixtures::USERNAME_USER, 82, 82, 'ar'],
+ [User::ROLE_USER, UserFixtures::USERNAME_USER, 82, 82, 'ar', null],
// admins are allowed to update their own hourly rate
- [User::ROLE_ADMIN, UserFixtures::USERNAME_ADMIN, 81, 37.5, 'ar'],
+ [User::ROLE_ADMIN, UserFixtures::USERNAME_ADMIN, 81, 37.5, 'ar', 19.54],
// admins are allowed to update other peoples hourly rate
- [User::ROLE_SUPER_ADMIN, UserFixtures::USERNAME_USER, 82, 37.5, 'en'],
+ [User::ROLE_SUPER_ADMIN, UserFixtures::USERNAME_USER, 82, 37.5, 'en', 19.54],
];
}
/**
* @dataProvider getPreferencesTestData
*/
- public function testPreferencesAction($role, $username, $hourlyRateOriginal, $hourlyRate, $expectedLocale)
+ public function testPreferencesAction($role, $username, $hourlyRateOriginal, $hourlyRate, $expectedLocale, $expectedInternalRate)
{
$client = $this->getClientForAuthenticatedUser($role);
$this->request($client, '/profile/' . $username . '/prefs');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
/** @var User $user */
- $user = $this->getUserByName($em, $username);
+ $user = $this->getUserByName($username);
$this->assertEquals($hourlyRateOriginal, $user->getPreferenceValue(UserPreference::HOURLY_RATE));
+ $this->assertNull($user->getPreferenceValue(UserPreference::INTERNAL_RATE));
$this->assertNull($user->getPreferenceValue(UserPreference::SKIN));
$this->assertEquals(false, $user->getPreferenceValue('theme.collapsed_sidebar'));
$this->assertEquals('month', $user->getPreferenceValue('calendar.initial_view'));
@@ -399,6 +403,7 @@ class ProfileControllerTest extends ControllerBaseTest
'user_preferences_form' => [
'preferences' => [
['name' => UserPreference::HOURLY_RATE, 'value' => 37.5],
+ ['name' => UserPreference::INTERNAL_RATE, 'value' => 19.54],
['name' => 'timezone', 'value' => 'America/Creston'],
['name' => 'language', 'value' => 'ar'],
['name' => UserPreference::SKIN, 'value' => 'blue'],
@@ -417,10 +422,10 @@ class ProfileControllerTest extends ControllerBaseTest
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
- $user = $this->getUserByName($em, $username);
+ $user = $this->getUserByName($username);
$this->assertEquals($hourlyRate, $user->getPreferenceValue(UserPreference::HOURLY_RATE));
+ $this->assertEquals($expectedInternalRate, $user->getPreferenceValue(UserPreference::INTERNAL_RATE));
$this->assertEquals('', $user->getPreferenceValue('America/Creston'));
$this->assertEquals('ar', $user->getPreferenceValue('language'));
$this->assertEquals('blue', $user->getPreferenceValue(UserPreference::SKIN));
diff --git a/tests/Controller/ProjectControllerTest.php b/tests/Controller/ProjectControllerTest.php
index d22edb41..2aa6fa13 100644
--- a/tests/Controller/ProjectControllerTest.php
+++ b/tests/Controller/ProjectControllerTest.php
@@ -36,6 +36,10 @@ class ProjectControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/project/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_USER, '/admin/project/');
}
@@ -60,7 +64,6 @@ class ProjectControllerTest extends ControllerBaseTest
});
$this->importFixture($client, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/project/');
$form = $client->getCrawler()->filter('form.header-search')->form();
@@ -81,7 +84,7 @@ class ProjectControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$project = $em->getRepository(Project::class)->find(1);
@@ -97,7 +100,6 @@ class ProjectControllerTest extends ControllerBaseTest
$fixture->setProjects([$project]);
$this->importFixture($client, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/project/1/details');
self::assertHasProgressbar($client);
@@ -146,7 +148,7 @@ class ProjectControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$project = $em->find(Project::class, 1);
$project->setMetaField((new ProjectMeta())->setName('foo')->setValue('bar'));
$project->setEnd(new \DateTime());
@@ -180,34 +182,6 @@ class ProjectControllerTest extends ControllerBaseTest
self::assertStringContainsString('123.45', $node->text(null, true));
}
- public function testDeleteRateAction()
- {
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $this->assertAccessIsGranted($client, '/admin/project/1/rate');
- $form = $client->getCrawler()->filter('form[name=project_rate_form]')->form();
- $client->submit($form, [
- 'project_rate_form' => [
- 'user' => null,
- 'rate' => 123.45,
- ]
- ]);
- $this->assertIsRedirect($client, $this->createUrl('/admin/project/1/details'));
- $client->followRedirect();
- $node = $client->getCrawler()->filter('div.box#project_rates_box');
- self::assertEquals(1, $node->count());
- $node = $client->getCrawler()->filter('div.box#project_rates_box table.dataTable tbody tr:not(.summary)');
- self::assertEquals(1, $node->count());
- self::assertStringContainsString('123.45', $node->text(null, true));
-
- $node = $client->getCrawler()->filter('div.box#project_rates_box table.dataTable tbody tr td.actions a');
- self::assertEquals(1, $node->count());
- $url = $node->attr('href');
- $client->request('GET', $url);
- $this->assertIsRedirect($client, $this->createUrl('/admin/project/1/details'));
- $node = $client->getCrawler()->filter('div.box#project_rates_box table.dataTable tbody tr:not(.summary)');
- self::assertEquals(0, $node->count());
- }
-
public function testAddCommentAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
@@ -241,7 +215,6 @@ class ProjectControllerTest extends ControllerBaseTest
$node = $client->getCrawler()->filter('div.box#comments_box .box-comment a.confirmation-link');
self::assertEquals($this->createUrl('/admin/project/1/comment_delete'), $node->attr('href'));
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->request($client, '/admin/project/1/comment_delete');
$this->assertIsRedirect($client, $this->createUrl('/admin/project/1/details'));
$client->followRedirect();
@@ -266,7 +239,6 @@ class ProjectControllerTest extends ControllerBaseTest
$node = $client->getCrawler()->filter('div.box#comments_box .box-comment a.btn.active');
self::assertEquals(0, $node->count());
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->request($client, '/admin/project/1/comment_pin');
$this->assertIsRedirect($client, $this->createUrl('/admin/project/1/details'));
$client->followRedirect();
@@ -282,7 +254,6 @@ class ProjectControllerTest extends ControllerBaseTest
$node = $client->getCrawler()->filter('div.box#team_listing_box .box-body');
self::assertStringContainsString('Visible to everyone, as no team was assigned yet.', $node->text(null, true));
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->request($client, '/admin/project/1/create_team');
$this->assertIsRedirect($client, $this->createUrl('/admin/project/1/details'));
$client->followRedirect();
@@ -299,14 +270,13 @@ class ProjectControllerTest extends ControllerBaseTest
self::assertEquals('', $client->getResponse()->getContent());
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$project = $em->getRepository(Project::class)->find(1);
$fixture = new ActivityFixtures();
$fixture->setAmount(9); // to trigger a second page (every third activity is hidden)
$fixture->setProjects([$project]);
$this->importFixture($client, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/project/1/activities/1');
$node = $client->getCrawler()->filter('div.box#activity_list_box .box-tools ul.pagination li');
@@ -398,7 +368,7 @@ class ProjectControllerTest extends ControllerBaseTest
public function testTeamPermissionAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Project $project */
$project = $em->getRepository(Project::class)->find(1);
@@ -457,7 +427,7 @@ class ProjectControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setAmount(10);
@@ -496,7 +466,7 @@ class ProjectControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
$fixture->setAmount(10);
diff --git a/tests/Controller/SystemConfigurationControllerTest.php b/tests/Controller/SystemConfigurationControllerTest.php
index 2bd17f61..1c555fbf 100644
--- a/tests/Controller/SystemConfigurationControllerTest.php
+++ b/tests/Controller/SystemConfigurationControllerTest.php
@@ -20,6 +20,10 @@ class SystemConfigurationControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/system-config/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/system-config/');
}
diff --git a/tests/Controller/TagControllerTest.php b/tests/Controller/TagControllerTest.php
index 1917407c..089d47f1 100644
--- a/tests/Controller/TagControllerTest.php
+++ b/tests/Controller/TagControllerTest.php
@@ -29,7 +29,7 @@ class TagControllerTest extends ControllerBaseTest
$this->importFixture($client, $fixture);
}
- public function testDebugIsSecure()
+ public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/tags/');
}
@@ -110,7 +110,7 @@ class TagControllerTest extends ControllerBaseTest
$node = $form->getFormNode();
$node->setAttribute('action', $this->createUrl('/admin/tags/multi-delete'));
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Tag[] $tags */
$tags = $em->getRepository(Tag::class)->findAll();
self::assertCount(10, $tags);
diff --git a/tests/Controller/TeamControllerTest.php b/tests/Controller/TeamControllerTest.php
index 86dd7217..375b7800 100644
--- a/tests/Controller/TeamControllerTest.php
+++ b/tests/Controller/TeamControllerTest.php
@@ -24,18 +24,21 @@ class TeamControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/teams/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_TEAMLEAD, '/admin/teams/');
}
public function testIndexAction()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(5);
$this->importFixture($em, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/teams/');
$this->assertPageActions($client, [
'search search-toggle visible-xs-inline' => '#',
@@ -49,7 +52,7 @@ class TeamControllerTest extends ControllerBaseTest
public function testIndexActionWithSearchTermQuery()
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(5);
$fixture->setCallback(function (Team $team) {
@@ -57,7 +60,6 @@ class TeamControllerTest extends ControllerBaseTest
});
$this->importFixture($em, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->assertAccessIsGranted($client, '/admin/teams/');
$form = $client->getCrawler()->filter('form.header-search')->form();
@@ -104,7 +106,7 @@ class TeamControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(2);
$this->importFixture($em, $fixture);
@@ -127,7 +129,7 @@ class TeamControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(2);
$this->importFixture($em, $fixture);
@@ -151,7 +153,7 @@ class TeamControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(2);
@@ -180,7 +182,7 @@ class TeamControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
/** @var EntityManager $em */
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TeamFixtures();
$fixture->setAmount(2);
diff --git a/tests/Controller/TimesheetControllerTest.php b/tests/Controller/TimesheetControllerTest.php
index e1004693..cd10d6af 100644
--- a/tests/Controller/TimesheetControllerTest.php
+++ b/tests/Controller/TimesheetControllerTest.php
@@ -51,7 +51,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$start = new \DateTime('first day of this month');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setAmountRunning(2);
@@ -88,7 +88,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
$start = new \DateTime('first day of this month');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
@@ -125,7 +125,7 @@ class TimesheetControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser();
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
@@ -182,7 +182,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$this->assertInstanceOf(\DateTime::class, $timesheet->getBegin());
@@ -236,7 +236,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$this->assertInstanceOf(\DateTime::class, $timesheet->getBegin());
@@ -270,7 +270,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$this->assertInstanceOf(\DateTime::class, $timesheet->getBegin());
@@ -290,7 +290,7 @@ class TimesheetControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser();
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
@@ -321,7 +321,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasFlashSaveSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$this->assertEquals('foo-bar', $timesheet->getDescription());
@@ -331,7 +331,7 @@ class TimesheetControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_USER);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
@@ -344,7 +344,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$node = $form->getFormNode();
$node->setAttribute('action', $this->createUrl('/timesheet/multi-delete'));
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet[] $timesheets */
$timesheets = $em->getRepository(Timesheet::class)->findAll();
self::assertCount(10, $timesheets);
@@ -370,7 +370,7 @@ class TimesheetControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_SUPER_ADMIN);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
@@ -383,7 +383,7 @@ class TimesheetControllerTest extends ControllerBaseTest
$node = $form->getFormNode();
$node->setAttribute('action', $this->createUrl('/timesheet/multi-update'));
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet[] $timesheets */
$timesheets = $em->getRepository(Timesheet::class)->findAll();
self::assertCount(10, $timesheets);
diff --git a/tests/Controller/TimesheetTeamControllerTest.php b/tests/Controller/TimesheetTeamControllerTest.php
index 2ad0211f..22e623d7 100644
--- a/tests/Controller/TimesheetTeamControllerTest.php
+++ b/tests/Controller/TimesheetTeamControllerTest.php
@@ -24,6 +24,10 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/team/timesheet/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_USER, '/team/timesheet/');
}
@@ -54,7 +58,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$start = new \DateTime('first day of this month');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
@@ -91,7 +95,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$start = new \DateTime('first day of this month');
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(5);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
@@ -128,7 +132,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$fixture = new TimesheetFixtures();
$fixture->setAmount(7);
$fixture->setUser($this->getUserByRole($em, User::ROLE_USER));
@@ -185,7 +189,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasFlashSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$this->assertInstanceOf(\DateTime::class, $timesheet->getBegin());
@@ -198,9 +202,9 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
public function testEditAction()
{
- $client = $this->getClientForAuthenticatedUser();
+ $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$teamlead = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$fixture = new TimesheetFixtures();
@@ -209,7 +213,6 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$fixture->setStartDate('2017-05-01');
$this->importFixture($em, $fixture);
- $client = $this->getClientForAuthenticatedUser(User::ROLE_ADMIN);
$this->request($client, '/team/timesheet/1/edit');
$response = $client->getResponse();
@@ -235,7 +238,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$this->assertTrue($client->getResponse()->isSuccessful());
$this->assertHasFlashSaveSuccess($client);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet $timesheet */
$timesheet = $em->getRepository(Timesheet::class)->find(1);
$this->assertEquals('foo-bar', $timesheet->getDescription());
@@ -246,7 +249,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_TEAMLEAD);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
@@ -259,7 +262,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$node = $form->getFormNode();
$node->setAttribute('action', $this->createUrl('/team/timesheet/multi-delete'));
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet[] $timesheets */
$timesheets = $em->getRepository(Timesheet::class)->findAll();
self::assertCount(10, $timesheets);
@@ -285,7 +288,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_TEAMLEAD);
$fixture = new TimesheetFixtures();
$fixture->setAmount(10);
@@ -298,7 +301,7 @@ class TimesheetTeamControllerTest extends ControllerBaseTest
$node = $form->getFormNode();
$node->setAttribute('action', $this->createUrl('/team/timesheet/multi-update'));
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
/** @var Timesheet[] $timesheets */
$timesheets = $em->getRepository(Timesheet::class)->findAll();
self::assertCount(10, $timesheets);
diff --git a/tests/Controller/UserControllerTest.php b/tests/Controller/UserControllerTest.php
index 7ba53411..606732e7 100644
--- a/tests/Controller/UserControllerTest.php
+++ b/tests/Controller/UserControllerTest.php
@@ -21,6 +21,10 @@ class UserControllerTest extends ControllerBaseTest
public function testIsSecure()
{
$this->assertUrlIsSecured('/admin/user/');
+ }
+
+ public function testIsSecureForRole()
+ {
$this->assertUrlIsSecuredForRole(User::ROLE_ADMIN, '/admin/user/');
}
@@ -141,7 +145,7 @@ class UserControllerTest extends ControllerBaseTest
{
$client = $this->getClientForAuthenticatedUser(User::ROLE_SUPER_ADMIN);
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
+ $em = $this->getEntityManager();
$user = $this->getUserByRole($em, User::ROLE_USER);
$fixture = new TimesheetFixtures();
diff --git a/tests/Entity/ActivityRateTest.php b/tests/Entity/ActivityRateTest.php
index 027953ea..81c4b859 100644
--- a/tests/Entity/ActivityRateTest.php
+++ b/tests/Entity/ActivityRateTest.php
@@ -25,6 +25,7 @@ class ActivityRateTest extends TestCase
$sut = new ActivityRate();
self::assertNull($sut->getId());
self::assertEquals(0.00, $sut->getRate());
+ self::assertNull($sut->getInternalRate());
self::assertNull($sut->getActivity());
self::assertNull($sut->getUser());
self::assertEquals(5, $sut->getScore());
@@ -41,11 +42,18 @@ class ActivityRateTest extends TestCase
self::assertInstanceOf(ActivityRate::class, $sut->setRate(12.34));
self::assertEquals(12.34, $sut->getRate());
+ self::assertInstanceOf(ActivityRate::class, $sut->setInternalRate(7.12));
+ self::assertEquals(7.12, $sut->getInternalRate());
+ $sut->setInternalRate(null);
+ self::assertNull($sut->getInternalRate());
+
$user = new User();
$user->setAlias('foo');
$user->setUsername('bar');
self::assertInstanceOf(ActivityRate::class, $sut->setUser($user));
self::assertSame($user, $sut->getUser());
+ $sut->setUser(null);
+ self::assertNull($sut->getUser());
$entity = new Activity();
$entity->setName('foo');
diff --git a/tests/Entity/CustomerRateTest.php b/tests/Entity/CustomerRateTest.php
index 45c5c309..2b8d1025 100644
--- a/tests/Entity/CustomerRateTest.php
+++ b/tests/Entity/CustomerRateTest.php
@@ -25,6 +25,7 @@ class CustomerRateTest extends TestCase
$sut = new CustomerRate();
self::assertNull($sut->getId());
self::assertEquals(0.00, $sut->getRate());
+ self::assertNull($sut->getInternalRate());
self::assertNull($sut->getCustomer());
self::assertNull($sut->getUser());
self::assertEquals(1, $sut->getScore());
@@ -41,11 +42,18 @@ class CustomerRateTest extends TestCase
self::assertInstanceOf(CustomerRate::class, $sut->setRate(12.34));
self::assertEquals(12.34, $sut->getRate());
+ self::assertInstanceOf(CustomerRate::class, $sut->setInternalRate(7.12));
+ self::assertEquals(7.12, $sut->getInternalRate());
+ $sut->setInternalRate(null);
+ self::assertNull($sut->getInternalRate());
+
$user = new User();
$user->setAlias('foo');
$user->setUsername('bar');
self::assertInstanceOf(CustomerRate::class, $sut->setUser($user));
self::assertSame($user, $sut->getUser());
+ $sut->setUser(null);
+ self::assertNull($sut->getUser());
$entity = new Customer();
$entity->setName('foo');
diff --git a/tests/Entity/ProjectRateTest.php b/tests/Entity/ProjectRateTest.php
index a12f29af..423703f4 100644
--- a/tests/Entity/ProjectRateTest.php
+++ b/tests/Entity/ProjectRateTest.php
@@ -25,6 +25,7 @@ class ProjectRateTest extends TestCase
$sut = new ProjectRate();
self::assertNull($sut->getId());
self::assertEquals(0.00, $sut->getRate());
+ self::assertNull($sut->getInternalRate());
self::assertNull($sut->getProject());
self::assertNull($sut->getUser());
self::assertEquals(3, $sut->getScore());
@@ -41,11 +42,18 @@ class ProjectRateTest extends TestCase
self::assertInstanceOf(ProjectRate::class, $sut->setRate(12.34));
self::assertEquals(12.34, $sut->getRate());
+ self::assertInstanceOf(ProjectRate::class, $sut->setInternalRate(7.12));
+ self::assertEquals(7.12, $sut->getInternalRate());
+ $sut->setInternalRate(null);
+ self::assertNull($sut->getInternalRate());
+
$user = new User();
$user->setAlias('foo');
$user->setUsername('bar');
self::assertInstanceOf(ProjectRate::class, $sut->setUser($user));
self::assertSame($user, $sut->getUser());
+ $sut->setUser(null);
+ self::assertNull($sut->getUser());
$entity = new Project();
$entity->setName('foo');
diff --git a/tests/Entity/TimesheetTest.php b/tests/Entity/TimesheetTest.php
index f3adb00a..8d6c2f07 100644
--- a/tests/Entity/TimesheetTest.php
+++ b/tests/Entity/TimesheetTest.php
@@ -38,11 +38,14 @@ class TimesheetTest extends TestCase
self::assertNull($sut->getDescription());
self::assertSame(0.00, $sut->getRate());
self::assertNull($sut->getFixedRate());
+ self::assertNull($sut->getInternalRate());
self::assertNull($sut->getHourlyRate());
self::assertEquals(new ArrayCollection(), $sut->getTags());
self::assertEquals([], $sut->getTagsAsArray());
self::assertInstanceOf(Timesheet::class, $sut->setFixedRate(13.47));
self::assertEquals(13.47, $sut->getFixedRate());
+ self::assertInstanceOf(Timesheet::class, $sut->setInternalRate(999.99));
+ self::assertEquals(999.99, $sut->getInternalRate());
self::assertInstanceOf(Timesheet::class, $sut->setHourlyRate(99));
self::assertEquals(99, $sut->getHourlyRate());
self::assertInstanceOf(Collection::class, $sut->getMetaFields());
@@ -50,7 +53,7 @@ class TimesheetTest extends TestCase
self::assertNull($sut->getMetaField('foo'));
}
- public function testDurationCanBeNull()
+ public function testValueCanBeNull()
{
$sut = new Timesheet();
self::assertEquals(0, $sut->getDuration());
@@ -58,6 +61,11 @@ class TimesheetTest extends TestCase
self::assertNull($sut->getDuration());
$sut->setDuration(-1);
self::assertEquals(-1, $sut->getDuration());
+
+ $sut->setInternalRate(1);
+ self::assertEquals(1, $sut->getInternalRate());
+ $sut->setInternalRate(null);
+ self::assertNull($sut->getInternalRate());
}
protected function getEntity()
diff --git a/tests/EventSubscriber/DashboardSubscriberTest.php b/tests/EventSubscriber/DashboardSubscriberTest.php
index bc8067fb..331dd36b 100644
--- a/tests/EventSubscriber/DashboardSubscriberTest.php
+++ b/tests/EventSubscriber/DashboardSubscriberTest.php
@@ -27,8 +27,8 @@ class DashboardSubscriberTest extends TestCase
public function testGetSubscribedEvents()
{
$events = DashboardSubscriber::getSubscribedEvents();
- $this->assertArrayHasKey(DashboardEvent::DASHBOARD, $events);
- $methodName = $events[DashboardEvent::DASHBOARD][0];
+ $this->assertArrayHasKey(DashboardEvent::class, $events);
+ $methodName = $events[DashboardEvent::class][0];
$this->assertTrue(method_exists(DashboardSubscriber::class, $methodName));
}
diff --git a/tests/EventSubscriber/RegistrationSubscriberTest.php b/tests/EventSubscriber/RegistrationSubscriberTest.php
index 984f5693..94b26fd3 100644
--- a/tests/EventSubscriber/RegistrationSubscriberTest.php
+++ b/tests/EventSubscriber/RegistrationSubscriberTest.php
@@ -16,7 +16,9 @@ use FOS\UserBundle\FOSUserEvents;
use FOS\UserBundle\Model\UserManagerInterface;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
/**
* @covers \App\EventSubscriber\RegistrationSubscriber
@@ -29,13 +31,14 @@ class RegistrationSubscriberTest extends TestCase
$this->assertArrayHasKey(FOSUserEvents::REGISTRATION_SUCCESS, $events);
$methodName = $events[FOSUserEvents::REGISTRATION_SUCCESS][0];
$this->assertTrue(method_exists(RegistrationSubscriber::class, $methodName));
+
+ $this->assertArrayHasKey(FOSUserEvents::RESETTING_RESET_SUCCESS, $events);
+ $methodName = $events[FOSUserEvents::RESETTING_RESET_SUCCESS][0];
+ $this->assertTrue(method_exists(RegistrationSubscriber::class, $methodName));
}
/**
- * Legacy test becuase the user bundle won't update to a new release
- *
* @dataProvider getTestData
- * @group legacy
*/
public function testRoleAssignmentForNewUser(array $existingUsers, $expectedRoles)
{
@@ -54,7 +57,7 @@ class RegistrationSubscriberTest extends TestCase
$event = new FormEvent($form, $request);
- $sut = new RegistrationSubscriber($userManager);
+ $sut = new RegistrationSubscriber($userManager, $this->createMock(UrlGeneratorInterface::class));
$sut->onRegistrationSuccess($event);
$this->assertEquals($expectedRoles, $user->getRoles());
@@ -70,4 +73,27 @@ class RegistrationSubscriberTest extends TestCase
[[new User()], [User::ROLE_USER]],
];
}
+
+ public function testResetting()
+ {
+ $userManager = $this->createMock(UserManagerInterface::class);
+ $form = $this->createMock(FormInterface::class);
+ $request = $this->createMock(Request::class);
+ $router = $this->createMock(UrlGeneratorInterface::class);
+
+ $router->expects($this->any())->method('generate')->willReturnArgument(0);
+ $request->expects($this->any())->method('getLocale')->willReturn('ru');
+
+ $event = new FormEvent($form, $request);
+ self::assertNull($event->getResponse());
+
+ $sut = new RegistrationSubscriber($userManager, $router);
+ $sut->onResettingSuccess($event);
+
+ self::assertInstanceOf(RedirectResponse::class, $event->getResponse());
+
+ /** @var RedirectResponse $response */
+ $response = $event->getResponse();
+ self::assertEquals('my_profile', $response->getTargetUrl());
+ }
}
diff --git a/tests/EventSubscriber/ResetPasswordSubscriberTest.php b/tests/EventSubscriber/ResetPasswordSubscriberTest.php
index 6a03f325..974158b3 100644
--- a/tests/EventSubscriber/ResetPasswordSubscriberTest.php
+++ b/tests/EventSubscriber/ResetPasswordSubscriberTest.php
@@ -32,6 +32,9 @@ class ResetPasswordSubscriberTest extends TestCase
$this->assertTrue(method_exists(ResetPasswordSubscriber::class, $methodName));
}
+ /**
+ * @group legacy
+ */
public function testUnknownUserTypeIsIgnored()
{
$user = new TestUserEntity();
diff --git a/tests/EventSubscriber/UserPreferenceSubscriberTest.php b/tests/EventSubscriber/UserPreferenceSubscriberTest.php
new file mode 100644
index 00000000..ccd6fa38
--- /dev/null
+++ b/tests/EventSubscriber/UserPreferenceSubscriberTest.php
@@ -0,0 +1,96 @@
+assertArrayHasKey(PrepareUserEvent::class, $events);
+ $methodName = $events[PrepareUserEvent::class][0];
+ $this->assertTrue(method_exists(UserPreferenceSubscriber::class, $methodName));
+ }
+
+ public function testWithHourlyRateAllowed()
+ {
+ $sut = $this->getSubscriber(true);
+ $user = new User();
+ $event = new PrepareUserEvent($user);
+
+ self::assertSame($user, $event->getUser());
+
+ $prefs = $sut->getDefaultPreferences($user);
+ self::assertCount(11, $prefs);
+
+ foreach ($prefs as $pref) {
+ switch ($pref->getName()) {
+ case UserPreference::HOURLY_RATE:
+ case UserPreference::INTERNAL_RATE:
+ self::assertTrue($pref->isEnabled());
+ break;
+
+ default:
+ self::assertTrue($pref->isEnabled());
+ }
+ }
+ }
+
+ public function testWithHourlyRateNotAllowed()
+ {
+ $sut = $this->getSubscriber(false);
+ $user = new User();
+ $event = new PrepareUserEvent($user);
+
+ self::assertSame($user, $event->getUser());
+
+ // TODO test merging values
+ $sut->loadUserPreferences($event);
+ $prefs = $event->getUser()->getPreferences();
+ self::assertCount(11, $prefs);
+
+ foreach ($prefs as $pref) {
+ switch ($pref->getName()) {
+ case UserPreference::HOURLY_RATE:
+ case UserPreference::INTERNAL_RATE:
+ self::assertFalse($pref->isEnabled());
+ break;
+
+ default:
+ self::assertTrue($pref->isEnabled());
+ }
+ }
+ }
+
+ protected function getSubscriber(bool $seeHourlyRate)
+ {
+ $authMock = $this->createMock(AuthorizationCheckerInterface::class);
+ $authMock->expects($this->once())->method('isGranted')->willReturn($seeHourlyRate);
+
+ $eventMock = $this->createMock(EventDispatcherInterface::class);
+ $tokenMock = $this->createMock(TokenStorageInterface::class);
+ $formConfigMock = $this->createMock(FormConfiguration::class);
+
+ return new UserPreferenceSubscriber($eventMock, $tokenMock, $authMock, $formConfigMock);
+ }
+}
diff --git a/tests/Export/Renderer/CsvRendererTest.php b/tests/Export/Renderer/CsvRendererTest.php
index c509dc57..a935443e 100644
--- a/tests/Export/Renderer/CsvRendererTest.php
+++ b/tests/Export/Renderer/CsvRendererTest.php
@@ -83,26 +83,27 @@ class CsvRendererTest extends AbstractRendererTest
2 => '12:06',
3 => '400',
4 => '0',
- 5 => 'kevin',
- 6 => 'Customer Name',
- 7 => 'project name',
- 8 => 'activity description',
- 9 => '',
+ 5 => '',
+ 6 => 'kevin',
+ 7 => 'Customer Name',
+ 8 => 'project name',
+ 9 => 'activity description',
10 => '',
- 11 => 'foo,bar',
- 12 => '',
- 13 => ' EUR 84.00 ',
- 14 => 'meta-bar',
- 15 => 'meta-bar2',
- 16 => 'customer-bar',
- 17 => '',
- 18 => 'project-foo2',
- 19 => 'activity-bar',
+ 11 => '',
+ 12 => 'foo,bar',
+ 13 => '',
+ 14 => ' EUR 84.00 ',
+ 15 => 'meta-bar',
+ 16 => 'meta-bar2',
+ 17 => 'customer-bar',
+ 18 => '',
+ 19 => 'project-foo2',
+ 20 => 'activity-bar',
];
self::assertEquals(7, count($all));
self::assertEquals($expected, $all[5]);
self::assertEquals(count($expected), count($all[0]));
- self::assertEquals('foo', $all[4][11]);
+ self::assertEquals('foo', $all[4][12]);
}
}
diff --git a/tests/Export/Timesheet/CsvRendererTest.php b/tests/Export/Timesheet/CsvRendererTest.php
index a8e2d715..3ee4c536 100644
--- a/tests/Export/Timesheet/CsvRendererTest.php
+++ b/tests/Export/Timesheet/CsvRendererTest.php
@@ -80,26 +80,27 @@ class CsvRendererTest extends AbstractRendererTest
2 => '12:06',
3 => '400',
4 => '0',
- 5 => 'kevin',
- 6 => 'Customer Name',
- 7 => 'project name',
- 8 => 'activity description',
- 9 => '',
+ 5 => '',
+ 6 => 'kevin',
+ 7 => 'Customer Name',
+ 8 => 'project name',
+ 9 => 'activity description',
10 => '',
- 11 => 'foo,bar',
- 12 => '',
- 13 => ' EUR 84.00 ',
- 14 => 'meta-bar',
- 15 => 'meta-bar2',
- 16 => 'customer-bar',
- 17 => '',
- 18 => 'project-foo2',
- 19 => 'activity-bar',
+ 11 => '',
+ 12 => 'foo,bar',
+ 13 => '',
+ 14 => ' EUR 84.00 ',
+ 15 => 'meta-bar',
+ 16 => 'meta-bar2',
+ 17 => 'customer-bar',
+ 18 => '',
+ 19 => 'project-foo2',
+ 20 => 'activity-bar',
];
self::assertEquals(7, count($all));
self::assertEquals($expected, $all[5]);
self::assertEquals(count($expected), count($all[0]));
- self::assertEquals('foo', $all[4][11]);
+ self::assertEquals('foo', $all[4][12]);
}
}
diff --git a/tests/Invoice/Hydrator/InvoiceItemDefaultHydratorTest.php b/tests/Invoice/Hydrator/InvoiceItemDefaultHydratorTest.php
index e7030ffb..496f4cd9 100644
--- a/tests/Invoice/Hydrator/InvoiceItemDefaultHydratorTest.php
+++ b/tests/Invoice/Hydrator/InvoiceItemDefaultHydratorTest.php
@@ -45,6 +45,9 @@ class InvoiceItemDefaultHydratorTest extends TestCase
'entry.rate',
'entry.rate_nc',
'entry.rate_plain',
+ 'entry.rate_internal',
+ 'entry.rate_internal_nc',
+ 'entry.rate_internal_plain',
'entry.total',
'entry.total_nc',
'entry.total_plain',
diff --git a/tests/Invoice/InvoiceItemTest.php b/tests/Invoice/InvoiceItemTest.php
index a556d00d..5ddb969d 100644
--- a/tests/Invoice/InvoiceItemTest.php
+++ b/tests/Invoice/InvoiceItemTest.php
@@ -26,6 +26,7 @@ class InvoiceItemTest extends TestCase
self::assertNull($sut->getFixedRate());
self::assertNull($sut->getEnd());
self::assertEquals(0.00, $sut->getRate());
+ self::assertEquals(0.00, $sut->getInternalRate());
self::assertNull($sut->getProject());
self::assertIsArray($sut->getAdditionalFields());
self::assertEmpty($sut->getAdditionalFields());
diff --git a/tests/Invoice/Renderer/DebugRendererTest.php b/tests/Invoice/Renderer/DebugRendererTest.php
index 18a44b75..0ad49b0c 100644
--- a/tests/Invoice/Renderer/DebugRendererTest.php
+++ b/tests/Invoice/Renderer/DebugRendererTest.php
@@ -199,6 +199,9 @@ class DebugRendererTest extends TestCase
'entry.rate',
'entry.rate_nc',
'entry.rate_plain',
+ 'entry.rate_internal',
+ 'entry.rate_internal_nc',
+ 'entry.rate_internal_plain',
'entry.total',
'entry.total_nc',
'entry.total_plain',
diff --git a/tests/Invoice/templates/default.pdf.twig b/tests/Invoice/templates/default.pdf.twig
index 3c55b4b0..a79b9a74 100644
--- a/tests/Invoice/templates/default.pdf.twig
+++ b/tests/Invoice/templates/default.pdf.twig
@@ -1,6 +1,7 @@
{% extends 'invoice/layout.html.twig' %}
{% set language = model.template.language|default(app.request.locale) %}
{% set isDecimal = model.template.decimalDuration|default(false) %}
+{% set currency = model.currency %}
{% block invoice %}
@@ -91,9 +92,9 @@
{% if entry.activity is not null %}{{ entry.activity.name }} / {% endif %}{{ entry.project.name }}
{% endif %}
-
{{ rate|money(model.calculator.currency) }}
+ {{ rate|money(currency) }}
{{ duration }}
- {{ entry.rate|money(model.calculator.currency) }}
+ {{ entry.rate|money(currency) }}
{% endfor %}
@@ -102,20 +103,20 @@
{{ 'invoice.subtotal'|trans({}, 'messages', language) }}
- {{ model.calculator.subtotal|money(model.calculator.currency) }}
+ {{ model.calculator.subtotal|money(currency) }}
{{ 'invoice.tax'|trans({}, 'messages', language) }} ({{ model.calculator.vat }}%)
- {{ model.calculator.tax|money(model.calculator.currency) }}
+ {{ model.calculator.tax|money(currency) }}
{{ 'invoice.total'|trans({}, 'messages', language) }}
- {{ model.calculator.total|money(model.calculator.currency) }}
+ {{ model.calculator.total|money(currency) }}
diff --git a/tests/KernelTestTrait.php b/tests/KernelTestTrait.php
index 8eb4b6ee..d97293b3 100644
--- a/tests/KernelTestTrait.php
+++ b/tests/KernelTestTrait.php
@@ -15,6 +15,7 @@ use Doctrine\Bundle\FixturesBundle\Fixture;
use Doctrine\Common\DataFixtures\Executor\ORMExecutor;
use Doctrine\Common\DataFixtures\Loader;
use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
use Symfony\Component\HttpKernel\HttpKernelBrowser;
@@ -23,20 +24,27 @@ use Symfony\Component\HttpKernel\HttpKernelBrowser;
*/
trait KernelTestTrait
{
+ public function getEntityManager(): EntityManagerInterface
+ {
+ if (!$this instanceof KernelTestCase) {
+ throw new \Exception('KernelTestTrait can only be used in a KernelTestCase');
+ }
+
+ return $this::$container->get('doctrine.orm.entity_manager');
+ }
+
/**
* @param HttpKernelBrowser|EntityManager|KernelTestCase $client
* @param Fixture $fixture
*/
protected function importFixture($client, Fixture $fixture)
{
- if ($client instanceof HttpKernelBrowser) {
- $em = static::$kernel->getContainer()->get('doctrine.orm.entity_manager');
- } elseif ($client instanceof EntityManager) {
+ if ($client instanceof EntityManager) {
$em = $client;
- } elseif ($client instanceof KernelTestCase) {
- $em = $client::$container->get('doctrine.orm.entity_manager');
+ } elseif ($this instanceof KernelTestCase) {
+ $em = $this::$container->get('doctrine.orm.entity_manager');
} else {
- throw new \InvalidArgumentException('Fixtures need an EntityManager to be imported');
+ throw new \InvalidArgumentException('Need an EntityManager to import fixtures');
}
$loader = new Loader();
@@ -46,9 +54,9 @@ trait KernelTestTrait
$executor->execute($loader->getFixtures(), true);
}
- protected function getUserByName(EntityManager $em, string $username): ?User
+ protected function getUserByName(string $username): ?User
{
- return $em->getRepository(User::class)->findOneBy(['username' => $username]);
+ return $this->getEntityManager()->getRepository(User::class)->findOneBy(['username' => $username]);
}
/**
@@ -81,6 +89,6 @@ trait KernelTestTrait
return null;
}
- return $this->getUserByName($em, $name);
+ return $this->getUserByName($name);
}
}
diff --git a/tests/Model/TimesheetCountedStatisticTest.php b/tests/Model/TimesheetCountedStatisticTest.php
new file mode 100644
index 00000000..cb2ba0c3
--- /dev/null
+++ b/tests/Model/TimesheetCountedStatisticTest.php
@@ -0,0 +1,42 @@
+getRecordRate());
+ self::assertEquals(0, $sut->getRecordDuration());
+ self::assertEquals(0, $sut->getRecordAmount());
+ self::assertEquals(0.0, $sut->getRecordInternalRate());
+ }
+
+ public function testSetter()
+ {
+ $sut = new TimesheetCountedStatistic();
+ self::assertInstanceOf(TimesheetCountedStatistic::class, $sut->setRecordRate(23.97));
+ self::assertInstanceOf(TimesheetCountedStatistic::class, $sut->setRecordDuration(21));
+ self::assertInstanceOf(TimesheetCountedStatistic::class, $sut->setRecordAmount(5));
+ self::assertInstanceOf(TimesheetCountedStatistic::class, $sut->setRecordInternalRate(99.09));
+
+ self::assertEquals(23.97, $sut->getRecordRate());
+ self::assertEquals(21, $sut->getRecordDuration());
+ self::assertEquals(5, $sut->getRecordAmount());
+ self::assertEquals(99.09, $sut->getRecordInternalRate());
+ }
+}
diff --git a/tests/Timesheet/Calculator/RateCalculatorTest.php b/tests/Timesheet/Calculator/RateCalculatorTest.php
index 06a70d0c..ab13b81b 100644
--- a/tests/Timesheet/Calculator/RateCalculatorTest.php
+++ b/tests/Timesheet/Calculator/RateCalculatorTest.php
@@ -44,6 +44,7 @@ class RateCalculatorTest extends TestCase
$record->setDuration(1800);
$record->setHourlyRate(100);
$record->setActivity(new Activity());
+ $record->setUser($this->getTestUser());
$sut = new RateCalculator([], $this->getRateRepositoryMock());
$sut->calculate($record);
@@ -59,6 +60,7 @@ class RateCalculatorTest extends TestCase
// make sure that fixed rate is always applied, even if hourly rate is set
$record->setHourlyRate(99);
$record->setActivity(new Activity());
+ $record->setUser($this->getTestUser());
$sut = new RateCalculator([], $this->getRateRepositoryMock());
$sut->calculate($record);
@@ -66,45 +68,59 @@ class RateCalculatorTest extends TestCase
}
public function getRateTestData()
- {
- yield 'a0' => [0.0, 0, 0, null, null, null, null, null, null, null, null];
- yield 'a1' => [0.0, 1800, 0, null, null, null, null, null, null, null, null];
- yield 'a2' => [0.5, 1800, 1, null, null, null, null, null, null, null, null];
- yield 'a3' => [0.0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
- yield 'b1' => [1.5, 1800, 1, 3, null, 5, null, 7, null, 9, null];
- yield 'b2' => [2.5, 1800, 1, null, null, 5, null, 7, null, 9, null];
- yield 'b3' => [3.5, 1800, 1, null, null, null, null, 7, null, 9, null];
- yield 'b4' => [4.5, 1800, 1, null, null, null, null, null, null, 9, null];
- yield 'b5' => [2.0, 1800, 1, null, 2, null, 3, null, 4, null, 5];
- yield 'b6' => [3.0, 1800, 1, null, null, null, 3, null, 4, null, 5];
- yield 'b7' => [4.0, 1800, 1, null, null, null, null, null, 4, null, 5];
- yield 'b8' => [3.0, 1800, 1, null, null, null, 3, null, null, null, 5];
- yield 'b9' => [2.0, 1800, 1, null, 2, null, null, null, null, null, 5];
- yield 'c0' => [5.0, 1800, 100, 10, null, null, null, null, null, null, null];
- yield 'd0' => [10, 1800, 100, null, 10, null, null, null, null, null, null];
- yield 'e0' => [10, 1800, 100, null, null, 20, null, null, null, null, null];
- yield 'f0' => [20, 1800, 100, null, null, null, 20, null, null, null, null];
- yield 'g0' => [15, 1800, 100, null, null, null, null, 30, null, null, null];
- yield 'h0' => [30, 1800, 100, null, null, null, null, null, 30, null, null];
- yield 'i0' => [20, 1800, 100, null, null, null, null, null, null, 40, null];
- yield 'j0' => [40, 1800, 100, null, null, null, null, null, null, null, 40];
+ { // expected, expInt, durat, userH, userIn, timeH, timeF, actH, actIn, actF, proH, proIn, proFi, custH, custIn, custF
+ yield 'a0' => [0.0, 0.0, 0, 0, 0, null, null, null, null, false, null, null, false, null, null, false];
+ yield 'a2' => [0.0, 0.0, 0, 0, null, null, null, null, null, false, null, null, false, null, null, false];
+ yield 'a4' => [0.0, 0.0, 1800, 0, 0, null, null, null, null, false, null, null, false, null, null, false];
+ yield 'a6' => [0.5, 6.72, 1800, 1, 13.44, null, null, null, null, false, null, null, false, null, null, false];
+ yield 'a8' => [0.0, 1, 0, 0, 0, 0, 0, 0, 1, true, 0, null, true, 0, null, true];
+ // rate: 1.5 => timesheet hourly rate , internal: 2.5 => activity hourly rate (30 min)
+ yield 'b1' => [1.5, 2.5, 1800, 1, 1, 3, null, 5, null, false, 7, null, false, 9, null, false];
+ yield 'b2' => [2.5, 2.5, 1800, 1, 1, null, null, 5, null, false, 7, null, false, 9, null, false];
+ yield 'b3' => [3.5, 6.5, 1800, 1, 1, null, null, null, null, false, 7, 13, false, 9, 9, false];
+ yield 'b4' => [4.5, 6.5, 1800, 1, 15, null, null, null, null, false, null, null, false, 9, 13, false];
+ // rate: 2.0 => timesheet fixed rate , internal: 3.0 => activity fixed rate
+ yield 'b5' => [2.0, 3.0, 1800, 1, 1, null, 2, 3, null, true, 4, null, true, 5, null, true];
+ yield 'b6' => [3.0, 3.0, 1800, 1, 1, null, null, 3, null, true, 4, null, true, 5, null, true];
+ yield 'b7' => [4.0, 4.0, 1800, 1, 1, null, null, null, null, false, 4, null, true, 5, null, true];
+ yield 'b8' => [3.0, 3.0, 1800, 1, 1, null, null, 3, null, true, null, null, false, 5, null, true];
+ // rate: 2.0 => timesheet fixed rate , internal: 5.0 => customer hourly rate
+ yield 'b9' => [2.0, 5.0, 1800, 1, 1, null, 2, null, null, false, null, null, false, 5, null, true];
+ // rate: 5.0 => timesheet hourly rate , internal: 7.5 => user internal rate (30 min)
+ yield 'c0' => [5.0, 7.5, 1800, 100, 15, 10, null, null, null, false, null, null, false, null, null, false];
+ // internal: 10 because no rule applies and as fallback the users internal rate is used
+ yield 'd0' => [10, 100, 1800, 100, 100, null, 10, null, null, false, null, null, false, null, null, false];
+ yield 'e0' => [10, 10, 1800, 100, 100, null, null, 20, null, false, null, null, false, null, null, false];
+ yield 'f0' => [20, 78, 1800, 100, 100, null, null, 20, 78, true, null, null, false, null, null, false];
+ yield 'g0' => [15, 11.5, 1800, 100, 100, null, null, null, null, false, 30, 23, false, null, null, false];
+ yield 'h0' => [30, 30, 1800, 100, 100, null, null, null, null, false, 30, null, true, null, null, false];
+ yield 'i0' => [20, 13.5, 1800, 100, 100, null, null, null, null, false, null, null, false, 40, 27, false];
+ yield 'j0' => [40, 84, 1800, 100, 45, null, null, null, null, false, null, null, false, 40, 84, true];
+ // make sure the last fallback for the internal rate is the users hourly rate
+ yield 'k0' => [8.82, 6, 1800, 17.64, 12, null, null, null, null, false, null, null, false, null, null, true];
+ yield 'k1' => [8.82, 8.82, 1800, 17.64, null, null, null, null, null, false, null, null, false, null, null, true];
}
/**
* @dataProvider getRateTestData
*/
public function testRates(
- $exptectedRate,
+ $expectedRate,
+ $expectedInternalRate,
$duration,
$userRate,
+ $userInternalRate,
$timesheetHourly,
$timesheetFixed,
- $activityHourly,
- $activityFixed,
- $projectHourly,
- $projectFixed,
- $customerHourly,
- $customerFixed
+ $activityRate,
+ $activityInternal,
+ $activityIsFixed,
+ $projectRate,
+ $projectInternal,
+ $projectIsFixed,
+ $customerRate,
+ $customerInternal,
+ $customerIsFixed
) {
$customer = new Customer();
@@ -122,42 +138,60 @@ class RateCalculatorTest extends TestCase
->setActivity($activity)
->setProject($project)
->setDuration($duration)
- ->setUser($this->getTestUser($userRate))
+ ->setUser($this->getTestUser($userRate, $userInternalRate))
;
$rates = [];
- if (null !== $customerFixed) {
- $rates[] = (new CustomerRate())->setRate($customerFixed)->setIsFixed(true);
- } elseif (null !== $customerHourly) {
- $rates[] = (new CustomerRate())->setRate($customerHourly);
+ if (null !== $customerRate) {
+ $rate = new CustomerRate();
+ $rate->setRate($customerRate);
+ $rate->setIsFixed($customerIsFixed);
+ if (null !== $customerInternal) {
+ $rate->setInternalRate($customerInternal);
+ }
+ $rates[] = $rate;
}
- if (null !== $projectFixed) {
- $rates[] = (new ProjectRate())->setRate($projectFixed)->setIsFixed(true);
- } elseif (null !== $projectHourly) {
- $rates[] = (new ProjectRate())->setRate($projectHourly);
+ if (null !== $projectRate) {
+ $rate = new ProjectRate();
+ $rate->setRate($projectRate);
+ $rate->setIsFixed($projectIsFixed);
+ if (null !== $projectInternal) {
+ $rate->setInternalRate($projectInternal);
+ }
+ $rates[] = $rate;
}
- if (null !== $activityFixed) {
- $rates[] = (new ActivityRate())->setRate($activityFixed)->setIsFixed(true);
- } elseif (null !== $activityHourly) {
- $rates[] = (new ActivityRate())->setRate($activityHourly);
+ if (null !== $activityRate) {
+ $rate = new ActivityRate();
+ $rate->setRate($activityRate);
+ $rate->setIsFixed($activityIsFixed);
+ if (null !== $activityInternal) {
+ $rate->setInternalRate($activityInternal);
+ }
+ $rates[] = $rate;
}
$sut = new RateCalculator([], $this->getRateRepositoryMock($rates));
$sut->calculate($timesheet);
- $this->assertEquals($exptectedRate, $timesheet->getRate());
+ $this->assertEquals($expectedRate, $timesheet->getRate());
+ $this->assertEquals($expectedInternalRate, $timesheet->getInternalRate());
}
- protected function getTestUser($rate = 75)
+ protected function getTestUser($rate = 75, $internalRate = 75)
{
+ $user = new User();
+
$pref = new UserPreference();
$pref->setName(UserPreference::HOURLY_RATE);
$pref->setValue($rate);
- $user = new User();
- $user->setPreferences([$pref]);
+ $prefInt = new UserPreference();
+ $prefInt->setName(UserPreference::INTERNAL_RATE);
+ $prefInt->setValue($internalRate);
+
+ $user->setPreferences([$pref, $prefInt]);
return $user;
}
diff --git a/tests/phpstan.neon b/tests/phpstan.neon
index 3dcde60c..fc982aa0 100644
--- a/tests/phpstan.neon
+++ b/tests/phpstan.neon
@@ -5,8 +5,6 @@ includes:
parameters:
tmpDir: %rootDir%/../../../var/cache/phpstan
- symfony:
- container_xml_path: '%rootDir%/../../../var/cache/dev/srcApp_KernelDevDebugContainer.xml'
ignoreErrors:
- '#Access to an undefined property Faker\\Generator::\$stateAbbr.#'
- '#Access to an undefined property Faker\\Generator::\$catchPhrase.#'
diff --git a/translations/export.de.xlf b/translations/export.de.xlf
index 20703bd2..3dc4b8d8 100644
--- a/translations/export.de.xlf
+++ b/translations/export.de.xlf
@@ -10,6 +10,10 @@
default-budget.pdf.twig
Inkl. Restbudget
+
+ default-internal.pdf.twig
+ Inkl. interner Kosten
+