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

1.18 (#3158)

Browse Source 
* bump version
* fix translation ids
* added css classes to modify form with custom css
* improve export pdf file names
* respect financial year in new report
* added new InvoiceCalculator: price
* upgrade packages and node-sass to v7
* title pattern for customer, project and activity via API
* support negative money without currency
* fix sub-locale in print export template
* fix overbooking validation for monthly budget
* fix copying entities with different set of custom-fields compared to the current configuration
This commit is contained in:
Kevin Papst
2022-02-25 20:41:56 +01:00
committed by GitHub
parent 34649d809e
commit c0168ecc5b
53 changed files with 1222 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/Twig/ExtensionsTest.php
View File

@@ -17,6 +17,7 @@ use PHPUnit\Framework\TestCase;
use Twig\Node\Node;
use Twig\TwigFilter;
use Twig\TwigFunction;
use Twig\TwigTest;
/**
* @covers \App\Twig\Extensions
@@ -28,6 +29,18 @@ class ExtensionsTest extends TestCase
return new Extensions();
}
private function getTest(string $name): TwigTest
{
$sut = $this->getSut();
foreach ($sut->getTests() as $test) {
if ($test->getName() === $name) {
return $test;
}
}
throw new \Exception('Unknown twig test: ' . $name);
}
public function testGetFilters()
{
$filters = ['report_date', 'docu_link', 'multiline_indent', 'color', 'font_contrast', 'default_color', 'nl2str'];
@@ -63,6 +76,22 @@ class ExtensionsTest extends TestCase
}
}
public function testGetTests()
{
$tests = ['number'];
$i = 0;
$sut = $this->getSut();
$twigTests = $sut->getTests();
$this->assertCount(\count($tests), $twigTests);
/** @var TwigTest $test */
foreach ($twigTests as $test) {
$this->assertInstanceOf(TwigTest::class, $test);
$this->assertEquals($tests[$i++], $test->getName());
}
}
public function testDocuLink()
{
$data = [
@@ -213,6 +242,17 @@ sdfsdf' . PHP_EOL . "\n" .
self::assertEquals('', $sut->defaultColor(''));
}
public function testIsNumeric()
{
$test = $this->getTest('number');
self::assertFalse(\call_user_func($test->getCallable(), null));
self::assertFalse(\call_user_func($test->getCallable(), true));
self::assertFalse(\call_user_func($test->getCallable(), false));
self::assertFalse(\call_user_func($test->getCallable(), '1'));
self::assertTrue(\call_user_func($test->getCallable(), 1));
self::assertTrue(\call_user_func($test->getCallable(), 1.0));
}
private static function assertIsValidColor(string $color)
{
self::assertStringStartsWith('#', $color);

23
tests/Twig/LocaleFormatExtensionsTest.php
View File

@@ -27,10 +27,10 @@ use Twig\TwigTest;
*/
class LocaleFormatExtensionsTest extends TestCase
{
private $localeEn = ['en' => ['date' => 'Y-m-d', 'duration' => '%h:%m h']];
private $localeDe = ['de' => ['date' => 'd.m.Y', 'duration' => '%h:%m h']];
private $localeRu = ['ru' => ['date' => 'd.m.Y', 'duration' => '%h:%m h']];
private $localeFake = ['XX' => ['date' => 'd.m.Y', 'duration' => '%h - %m - %s Zeit']];
private $localeEn = ['en' => ['date' => 'Y-m-d', 'duration' => '%h:%m h', 'date_type' => 'yyyy-MM-dd']];
private $localeDe = ['de' => ['date' => 'd.m.Y', 'duration' => '%h:%m h', 'date_type' => 'yyyy-MM-dd']];
private $localeRu = ['ru' => ['date' => 'd.m.Y', 'duration' => '%h:%m h', 'date_type' => 'yyyy-MM-dd']];
private $localeFake = ['XX' => ['date' => 'd.m.Y', 'duration' => '%h - %m - %s Zeit', 'date_type' => 'yyyy-MM-dd']];
/**
* @param string|array $locale
@@ -74,7 +74,7 @@ class LocaleFormatExtensionsTest extends TestCase
public function testGetFunctions()
{
$functions = ['get_format_duration', 'create_date', 'locales', 'month_names'];
$functions = ['javascript_configurations', 'get_format_duration', 'create_date', 'locales', 'month_names'];
$i = 0;
$sut = $this->getSut('de', []);
@@ -479,6 +479,19 @@ class LocaleFormatExtensionsTest extends TestCase
self::assertEquals(342.94, $sut->durationChart(1234567));
}
public function testJavascriptConfigurations()
{
$expected = [
'formatDuration' => '%h:%m h',
'formatDate' => 'YYYY-MM-DD',
'defaultColor' => '#d2d6de',
'twentyFourHours' => true,
'updateBrowserTitle' => false,
];
$sut = $this->getSut('en', $this->localeEn);
self::assertEquals($expected, $sut->getJavascriptConfiguration(new User()));
}
public function testDurationDecimal()
{
$record = $this->getTimesheet(9437);