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

improve configurations for usage in multi-environment setups (#1775)

Browse Source
This commit is contained in:
Kevin Papst
2020-06-11 01:26:57 +02:00
committed by GitHub
parent 57b4473bc8
commit 21d8e8bbb8
17 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/DependencyInjection/AppExtensionTest.php
View File

@@ -37,6 +37,7 @@ class AppExtensionTest extends TestCase
{
$container = new ContainerBuilder();
$container->setParameter('app_locales', 'de|en|tr|zh_CN');
$container->setParameter('kernel.project_dir', realpath(__DIR__ . '/../../'));
return $container;
}
@@ -55,7 +56,7 @@ class AppExtensionTest extends TestCase
],
],
'data_dir' => '/tmp/',
'plugin_dir' => '/tmp/',
'plugin_dir' => '/tmp/', // still here, to make sure that this value is NOT applied!
'timesheet' => [],
'saml' => [
'connection' => []
@@ -72,7 +73,7 @@ class AppExtensionTest extends TestCase
$expected = [
'kimai.data_dir' => '/tmp/',
'kimai.plugin_dir' => '/tmp/',
'kimai.plugin_dir' => realpath(__DIR__ . '/../../') . '/var/plugins',
'kimai.languages' => [
'en' => [
'date_time_type' => 'yyyy-MM-dd HH:mm',

8
tests/DependencyInjection/ConfigurationTest.php
View File

@@ -54,10 +54,12 @@ class ConfigurationTest extends TestCase
public function testValidatePluginDir()
{
$this->expectException(InvalidConfigurationException::class);
$this->expectExceptionMessage('Invalid configuration for path "kimai.plugin_dir": Plugin directory does not exist');
$finalizedConfig = $this->getCompiledConfig($this->getMinConfig());
$finalizedConfig['plugin_dir'] = 'sdfsdfs';
$this->assertConfig($this->getMinConfig('/tmp/', 'sdfsdfs'), []);
$config = $this->getMinConfig('/tmp/', 'sdfsdfs');
$this->assertConfig($config, $finalizedConfig);
}
public function testValidateLdapConfigUserBaseDn()