Do not separate unit and functional tests

Both can be run with a single command and configuration.
Therefore merge both configurations into one and adjust CI call.
This commit is contained in:
Daniel Siepmann 2020-08-07 10:22:32 +02:00
parent 7d3aeabcdd
commit 5d4b724485
3 changed files with 13 additions and 41 deletions

View file

@ -58,8 +58,5 @@ jobs:
- name: Code Quality (by PHPStan) - name: Code Quality (by PHPStan)
run: ./vendor/bin/phpstan analyse run: ./vendor/bin/phpstan analyse
- name: PHPUnit Unit Tests - name: PHPUnit Tests
run: ./vendor/bin/phpunit --testdox run: ./vendor/bin/phpunit --testdox
- name: PHPUnit Functional Tests
run: ./vendor/bin/phpunit -c Tests/Functional/phpunit.xml.dist --testdox

View file

@ -1,32 +0,0 @@
<phpunit
backupGlobals="true"
backupStaticAttributes="false"
bootstrap="../../vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
colors="true"
convertErrorsToExceptions="false"
convertWarningsToExceptions="false"
forceCoversAnnotation="false"
processIsolation="false"
stopOnError="false"
stopOnFailure="false"
stopOnIncomplete="false"
stopOnSkipped="false"
verbose="false">
<testsuites>
<testsuite name="functional-tests">
<directory>.</directory>
</testsuite>
</testsuites>
<filter>
<whitelist>
<directory suffix=".php">../../Classes/Command</directory>
<directory suffix=".php">../../Classes/Dashboard</directory>
</whitelist>
</filter>
<php>
<env name="typo3DatabaseDriver" value="pdo_sqlite"/>
</php>
</phpunit>

View file

@ -1,9 +1,10 @@
<phpunit <phpunit
backupGlobals="false" backupGlobals="false"
backupStaticAttributes="false" backupStaticAttributes="false"
bootstrap="vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
colors="true" colors="true"
convertErrorsToExceptions="false" convertErrorsToExceptions="true"
convertWarningsToExceptions="false" convertWarningsToExceptions="true"
forceCoversAnnotation="false" forceCoversAnnotation="false"
processIsolation="false" processIsolation="false"
stopOnError="false" stopOnError="false"
@ -13,15 +14,21 @@
verbose="false"> verbose="false">
<testsuites> <testsuites>
<testsuite name="unit-tests"> <testsuite name="unit">
<directory>Tests/Unit/</directory> <directory>Tests/Unit/</directory>
</testsuite> </testsuite>
<testsuite name="functional">
<directory>Tests/Functional/</directory>
</testsuite>
</testsuites> </testsuites>
<filter> <filter>
<whitelist> <whitelist>
<directory suffix=".php">Classes/Domain</directory> <directory suffix=".php">Classes</directory>
<directory suffix=".php">Classes/Middleware</directory>
</whitelist> </whitelist>
</filter> </filter>
<php>
<env name="typo3DatabaseDriver" value="pdo_sqlite"/>
</php>
</phpunit> </phpunit>