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

Invoices: show only custom documents in upload form (#1786)

Browse Source
This commit is contained in:
Kevin Papst
2020-06-19 18:31:08 +02:00
committed by GitHub
parent 470a6b30e0
commit 381f46cdd8
16 changed files with 222 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Controller/InvoiceControllerTest.php
View File

@@ -412,8 +412,8 @@ class InvoiceControllerTest extends ControllerBaseTest
$this->request($client, '/invoice/document_upload');
$this->assertTrue($client->getResponse()->isSuccessful());
$node = $client->getCrawler()->filter('div.box#invoice_document_list');
self::assertEquals(1, $node->count());
$node = $client->getCrawler()->filter('form[name=invoice_document_upload_form]');
self::assertEquals(1, $node->count(), 'Could not find upload form');
// we do not test the upload here, just make sure that the action can be rendered properly
}
}

47
tests/Repository/InvoiceDocumentRepositoryTest.php
View File

@@ -22,6 +22,12 @@ class InvoiceDocumentRepositoryTest extends TestCase
'templates/invoice/renderer'
];
protected static $testDocuments = [
'spreadsheet.xsls',
'open-spreadsheet.ods',
'default.pdf.twig',
];
protected static $defaultDocuments = [
'company.docx',
'default.html.twig',
@@ -33,19 +39,50 @@ class InvoiceDocumentRepositoryTest extends TestCase
'xml.xml.twig',
];
public function testWithEmptyDirectory()
public function testDirectories()
{
$sut = new InvoiceDocumentRepository([]);
$this->assertEmpty($sut->findAll());
$this->assertIsArray($sut->findAll());
$this->assertNull($sut->findByName('default'));
self::assertEmpty($sut->findAll());
self::assertIsArray($sut->findAll());
self::assertNull($sut->findByName('default'));
try {
$sut->getUploadDirectory();
$this->fail('Expected exception was not raised');
} catch (\Exception $ex) {
$this->assertEquals('Unknown upload directory', $ex->getMessage());
}
$path = realpath(__DIR__ . '/../Invoice/templates/');
$sut->addDirectory($path);
$sut->addDirectory(InvoiceDocumentRepository::DEFAULT_DIRECTORY);
$sut->addDirectory(__DIR__);
self::assertEquals(__DIR__, $sut->getUploadDirectory());
$sut->removeDirectory(__DIR__);
self::assertCount(\count(self::$defaultDocuments), $sut->findBuiltIn());
self::assertCount(\count(self::$testDocuments), $sut->findCustom());
// template "default" exists twice, so its 10 instead of 11
$all = [];
foreach (self::$defaultDocuments as $document) {
$all[] = substr($document, 0, strpos($document, '.'));
}
foreach (self::$testDocuments as $document) {
$all[] = substr($document, 0, strpos($document, '.'));
}
$all = array_unique(array_values($all));
self::assertCount(\count($all), $sut->findAll());
self::assertEquals($path, $sut->getUploadDirectory());
}
public function testDefaultTemplatesExists()
{
$sut = new InvoiceDocumentRepository(self::$defaultDirectories);
$all = $sut->findAll();
$this->assertEquals(\count(self::$defaultDocuments), \count($all));
$this->assertCount(\count(self::$defaultDocuments), $all);
foreach ($all as $document) {
$this->assertTrue(\in_array($document->getName(), self::$defaultDocuments));