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

allow empty invoice template terms #188 (#189)

Browse Source
This commit is contained in:
Kevin Papst
2018-06-29 19:49:01 +02:00
committed by GitHub
parent b05d416e80
commit 0eb8ae5117
4 changed files with 111 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entity/InvoiceTemplate.php
View File

@@ -306,7 +306,7 @@ class InvoiceTemplate
* @param string $paymentTerms
* @return InvoiceTemplate
*/
public function setPaymentTerms(string $paymentTerms)
public function setPaymentTerms(?string $paymentTerms)
{
$this->paymentTerms = $paymentTerms;

57
tests/Entity/AbstractEntityTest.php Normal file
View File

@@ -0,0 +1,57 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Entity;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Validator\ConstraintViolationInterface;
use Symfony\Component\Validator\Validation;
/**
* @covers \App\Entity\Timesheet
*/
abstract class AbstractEntityTest extends TestCase
{
/**
* @param $value
* @param array|string $fieldNames
*/
protected function assertHasViolationForField($value, $fieldNames)
{
$validator = Validation::createValidatorBuilder()->enableAnnotationMapping()->getValidator();
$validations = $validator->validate($value);
if (!is_array($fieldNames)) {
$fieldNames = [$fieldNames];
}
$violatedFields = [];
/** @var ConstraintViolationInterface $validation */
foreach ($validations as $validation) {
$violatedFields[] = $validation->getPropertyPath();
}
foreach ($fieldNames as $id => $propertyPath) {
$foundField = false;
if (in_array($propertyPath, $violatedFields)) {
$foundField = true;
unset($violatedFields[$id]);
}
$this->assertTrue($foundField, 'Failed finding violation for field: ' . $propertyPath);
}
$this->assertEmpty($violatedFields, sprintf('Unexpected violations found: %s', implode(', ', $violatedFields)));
$expected = count($fieldNames);
$actual = $validations->count();
$this->assertEquals($expected, $actual, sprintf('Expected %s violations, found %s.', $expected, $actual));
}
}

51
tests/Entity/InvoiceTemplateTest.php Normal file
View File

@@ -0,0 +1,51 @@
<?php
/*
* This file is part of the Kimai time-tracking app.
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace App\Tests\Entity;
use App\Entity\InvoiceTemplate;
/**
* @covers \App\Entity\InvoiceTemplate
*/
class InvoiceTemplateTest extends AbstractEntityTest
{
protected function assertIsFluent($actual)
{
$this->assertInstanceOf(InvoiceTemplate::class, $actual);
}
protected function getEntity()
{
$entity = new InvoiceTemplate();
return $entity;
}
public function testSetGetPaymentTerms()
{
$sut = $this->getEntity();
$this->assertNull($sut->getPaymentTerms());
$this->assertIsFluent($sut->setPaymentTerms(null));
$this->assertIsFluent($sut->setPaymentTerms(''));
$this->assertIsFluent($sut->setPaymentTerms('foo bar'));
$this->assertEquals('foo bar', $sut->getPaymentTerms());
}
public function testToString()
{
$sut = $this->getEntity();
$this->assertNull($sut->__toString());
$this->assertIsFluent($sut->setName('a template name'));
$this->assertEquals('a template name', $sut->__toString());
$this->assertEquals('a template name', (string) $sut);
}
}

44
tests/Entity/TimesheetTest.php
View File

@@ -7,21 +7,18 @@
* file that was distributed with this source code.
*/
namespace App\Tests\Twig;
namespace App\Tests\Entity;
use App\Entity\Activity;
use App\Entity\Customer;
use App\Entity\Project;
use App\Entity\Timesheet;
use App\Entity\User;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Validator\ConstraintViolationInterface;
use Symfony\Component\Validator\Validation;
/**
* @covers \App\Entity\Timesheet
*/
class TimesheetTest extends TestCase
class TimesheetTest extends AbstractEntityTest
{
protected function getEntity()
{
@@ -85,41 +82,4 @@ class TimesheetTest extends TestCase
$this->assertHasViolationForField($entity, []);
}
/**
* @param $value
* @param array|string $fieldNames
*/
protected function assertHasViolationForField($value, $fieldNames)
{
$validator = Validation::createValidatorBuilder()->enableAnnotationMapping()->getValidator();
$validations = $validator->validate($value);
if (!is_array($fieldNames)) {
$fieldNames = [$fieldNames];
}
$violatedFields = [];
/** @var ConstraintViolationInterface $validation */
foreach ($validations as $validation) {
$violatedFields[] = $validation->getPropertyPath();
}
foreach ($fieldNames as $id => $propertyPath) {
$foundField = false;
if (in_array($propertyPath, $violatedFields)) {
$foundField = true;
unset($violatedFields[$id]);
}
$this->assertTrue($foundField, 'Failed finding violation for field: ' . $propertyPath);
}
$this->assertEmpty($violatedFields, sprintf('Unexpected violations found: %s', implode(', ', $violatedFields)));
$expected = count($fieldNames);
$actual = $validations->count();
$this->assertEquals($expected, $actual, sprintf('Expected %s violations, found %s.', $expected, $actual));
}
}