diff options
| author | Joas Schilling <coding@schilljs.com> | 2020-07-10 14:13:59 +0300 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2020-07-10 14:23:15 +0300 |
| commit | e9dfd13fe04e3b4784a17e639a835dd51d8c44fd (patch) | |
| tree | b3eef2502c7ed7de3a4102cd306b3d5d36218f85 /tests | |
| parent | 9085f08269c1f7f715b52f3395ccc80f1afb9b7b (diff) | |
Combine both phpunit configs into one
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/phpunit.unit.xml | 14 | ||||
| -rw-r--r-- | tests/phpunit.xml (renamed from tests/phpunit.integration.xml) | 1 | ||||
| -rwxr-xr-x | tests/scripts/phpunit.sh | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/tests/phpunit.unit.xml b/tests/phpunit.unit.xml deleted file mode 100644 index c56ee9e..0000000 --- a/tests/phpunit.unit.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<phpunit bootstrap="bootstrap.php" - verbose="true" - > - <testsuite name='Registration app tests'> - <directory suffix='Test.php'>Unit</directory> - </testsuite> - <!-- filters for code coverage --> - <filter> - <whitelist> - <directory suffix=".php">../</directory> - </whitelist> - </filter> -</phpunit> diff --git a/tests/phpunit.integration.xml b/tests/phpunit.xml index dbdf50d..b833956 100644 --- a/tests/phpunit.integration.xml +++ b/tests/phpunit.xml @@ -4,6 +4,7 @@ > <testsuite name='Registration app tests'> <directory suffix='Test.php'>Integration</directory> + <directory suffix='Test.php'>Unit</directory> </testsuite> <!-- filters for code coverage --> <filter> diff --git a/tests/scripts/phpunit.sh b/tests/scripts/phpunit.sh index bab4f16..0f92356 100755 --- a/tests/scripts/phpunit.sh +++ b/tests/scripts/phpunit.sh @@ -7,7 +7,6 @@ set -e cd ${BUILD_APP_MODULE_DIR} composer install --prefer-dist --no-interaction -o -vendor/bin/phpunit -c tests/phpunit.unit.xml -vendor/bin/phpunit -c tests/phpunit.integration.xml +vendor/bin/phpunit -c tests/phpunit.xml echo "travis_fold:end:phpunit" |