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

prepare release 1.14 (#2495)

Browse Source 
* removed un-maintained docker file
* update all packages
* fix deprecations
* only show one line descriptions for customer, projects and activities
* allow to show export column in timesheet listing
This commit is contained in:
Kevin Papst
2021-04-08 18:07:57 +02:00
committed by GitHub
parent 2ce6e815ff
commit af9dea9226
30 changed files with 920 additions and 739 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
tests/Twig/Runtime/MarkdownExtensionTest.php
View File

@@ -77,4 +77,42 @@ class MarkdownExtensionTest extends TestCase
$sut->commentContent("- test\n- foo\n\nfoo __bar__")
);
}
public function testCommentOneLiner()
{
$loader = $this->createMock(ConfigLoaderInterface::class);
$config = new SystemConfiguration($loader, []);
$sut = new MarkdownExtension(new Markdown(), $config);
$loremIpsum = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
$this->assertEquals('', $sut->commentOneLiner(null));
$this->assertEquals('', $sut->commentOneLiner(''));
$this->assertEquals('', $sut->commentOneLiner(null, false));
$this->assertEquals('', $sut->commentOneLiner('', true));
$this->assertEquals(
'Lorem ipsum dolor sit amet, consetetur sadipscing …',
$sut->commentOneLiner($loremIpsum, false)
);
$this->assertEquals(
'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. …',
$sut->commentOneLiner(implode(PHP_EOL, [$loremIpsum, $loremIpsum, $loremIpsum]), true)
);
$this->assertEquals(
'Lorem ipsum dolor sit amet, consetetur sadipscing …',
$sut->commentOneLiner(implode(PHP_EOL, [$loremIpsum, $loremIpsum, $loremIpsum]), false)
);
$this->assertEquals(
'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt',
$sut->commentOneLiner(implode(PHP_EOL, ['Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt']), true)
);
$this->assertEquals(
'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt …',
$sut->commentOneLiner(implode(PHP_EOL, ['Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt', 'ssdf']), true)
);
}
}

9
tests/Twig/RuntimeExtensionsTest.php
View File

@@ -22,7 +22,7 @@ class RuntimeExtensionsTest extends TestCase
{
public function testGetFilters()
{
$expected = ['md2html', 'desc2html', 'comment2html'];
$expected = ['md2html', 'desc2html', 'comment2html', 'comment1line'];
$i = 0;
$sut = new RuntimeExtensions();
@@ -67,6 +67,7 @@ class RuntimeExtensionsTest extends TestCase
$found_md2html = false;
$found_desc2html = false;
$found_comment2html = false;
$found_comment1line = false;
foreach ($filters as $filter) {
switch ($filter->getName()) {
@@ -85,11 +86,17 @@ class RuntimeExtensionsTest extends TestCase
self::assertEquals(['html'], $filters[2]->getSafe(new Node()));
$found_comment2html = true;
break;
case 'comment1line':
self::assertEquals('html', $filters[3]->getPreEscape());
self::assertEquals(['html'], $filters[3]->getSafe(new Node()));
$found_comment1line = true;
break;
}
}
self::assertTrue($found_md2html, 'Missing filter: md2html');
self::assertTrue($found_desc2html, 'Missing filter: desc2html');
self::assertTrue($found_comment2html, 'Missing filter: comment2html');
self::assertTrue($found_comment1line, 'Missing filter: comment1line');
}
}