iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:engelsystem/engelsystem

This commit is contained in:
Felix Favre 2015-06-07 15:06:24 +02:00
parent dc2c986522 c6c0e8f2ff
commit c88b1adcfe
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
includes/engelsystem_provider.php
View File

@ -71,7 +71,9 @@ require_once realpath(__DIR__ . '/../includes/pages/user_shifts.php');
require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php'); require_once realpath(__DIR__ . '/../vendor/parsedown/Parsedown.php');
session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__))); if (! defined('PHPUNIT_TESTSUITE')) {
session_lifetime(24 * 60, preg_replace("/[^a-z0-9-]/", '', md5(__DIR__)));
}
session_start(); session_start();
gettext_init(); gettext_init();

9
test/phpunit.xml
View File

@ -1,11 +1,14 @@
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.0/phpunit.xsd" xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.0/phpunit.xsd"
bootstrap="../includes/engelsystem_provider.php" colors="true" convertErrorsToExceptions="true" bootstrap="../includes/engelsystem_provider.php" colors="true"
convertNoticesToExceptions="true" convertWarningsToExceptions="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true"
forceCoversAnnotation="false"> convertWarningsToExceptions="true" forceCoversAnnotation="false">
<testsuites> <testsuites>
<testsuite name="Models"> <testsuite name="Models">
<directory>model</directory> <directory>model</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
<php>
<const name="PHPUNIT_TESTSUITE" value="true" />
</php>
</phpunit> </phpunit>