composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 10:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/faf_event_service

Browse Source 
# Conflicts:
#	application/cmdbabstract.class.inc.php
#	application/loginwebpage.class.inc.php
#	core/dbobject.class.php
#	core/log.class.inc.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
#	setup/compiler.class.inc.php
#	test/phpunit.xml.dist
This commit is contained in:
Eric Espie
2021-12-31 08:42:16 +01:00
parent 78f51d40f6 16142bd979
commit 551abc861e
4160 changed files with 303752 additions and 85353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/phpunit.xml.dist
View File

@@ -1,4 +1,4 @@
<!-- Copyright (c) 2010-2017 Combodo SARL -->
<!-- Copyright (c) 2010-2021 Combodo SARL -->
<!-- -->
<!-- This file is part of iTop. -->
<!-- -->
@@ -47,6 +47,9 @@
<testsuite name="Core">
<directory>core</directory>
</testsuite>
<testsuite name="Webservices">
<directory>webservices</directory>
</testsuite>
<testsuite name="Tickets">
<directory>itop-tickets</directory>
</testsuite>
@@ -59,6 +62,15 @@
<testsuite name="Status">
<directory>status</directory>
</testsuite>
<testsuite name="Synchro">
<directory>synchro</directory>
</testsuite>
<testsuite name="Setup">
<file>setup/SetupUtilsTest.php</file>
</testsuite>
<testsuite name="Integration">
<directory>integration</directory>
</testsuite>
<testsuite name="Service">
<directory>service</directory>
</testsuite>