danielsiepmann/tea
danielsiepmann/tea
1
0
mirror of https://github.com/FriendsOfTYPO3/tea.git synced 2024-09-19 23:56:13 +02:00
Code Activity

[TASK] Move the PHPUnit configuration files to Configuration/ (#1108)

Browse source 
The `Tests/` directory should only include test code, but not the
configuration files.

Fixes #1082
This commit is contained in:
Oliver Klee 2024-01-08 00:41:08 +01:00 committed by GitHub
parent 2228ba88ee
commit 7fe2758291
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitattributes vendored
View file

@ -11,6 +11,8 @@
/.phpstorm.meta.php export-ignore /.phpstorm.meta.php export-ignore
/.prettierrc.js export-ignore /.prettierrc.js export-ignore
/Build/ export-ignore /Build/ export-ignore
/Configuration/FunctionalTests.xml export-ignore
/Configuration/UnitTests.xml export-ignore
/Tests/ export-ignore /Tests/ export-ignore
/package.json export-ignore /package.json export-ignore
/phive.xml export-ignore /phive.xml export-ignore

2
Tests/Functional/FunctionalTests.xml → Configuration/FunctionalTests.xml
View file

@ -4,7 +4,7 @@
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
backupGlobals="true" backupGlobals="true"
beStrictAboutTestsThatDoNotTestAnything="false" beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php" bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/FunctionalTestsBootstrap.php"
cacheResult="false" cacheResult="false"
colors="true" colors="true"
convertDeprecationsToExceptions="true" convertDeprecationsToExceptions="true"

2
Tests/Unit/UnitTests.xml → Configuration/UnitTests.xml
View file

@ -4,7 +4,7 @@
xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
backupGlobals="true" backupGlobals="true"
beStrictAboutTestsThatDoNotTestAnything="false" beStrictAboutTestsThatDoNotTestAnything="false"
bootstrap="../../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php" bootstrap="../.Build/vendor/typo3/testing-framework/Resources/Core/Build/UnitTestsBootstrap.php"
cacheResult="false" cacheResult="false"
colors="true" colors="true"
convertDeprecationsToExceptions="true" convertDeprecationsToExceptions="true"

10
composer.json
View file

@ -118,7 +118,7 @@
"ci:coverage:functional": [ "ci:coverage:functional": [
"@ci:tests:create-directories", "@ci:tests:create-directories",
"@coverage:create-directories", "@coverage:create-directories",
".Build/bin/phpunit -c ./Tests/Functional/FunctionalTests.xml --whitelist Classes --coverage-php=.Build/coverage/functional.cov Tests/Functional" ".Build/bin/phpunit -c ./Configuration/FunctionalTests.xml --whitelist Classes --coverage-php=.Build/coverage/functional.cov Tests/Functional"
], ],
"ci:coverage:merge": [ "ci:coverage:merge": [
"@coverage:create-directories", "@coverage:create-directories",
@ -126,7 +126,7 @@
], ],
"ci:coverage:unit": [ "ci:coverage:unit": [
"@coverage:create-directories", "@coverage:create-directories",
".Build/bin/phpunit -c ./Tests/Unit/UnitTests.xml --whitelist Classes --coverage-php=.Build/coverage/unit.cov Tests/Unit" ".Build/bin/phpunit -c ./Configuration/UnitTests.xml --whitelist Classes --coverage-php=.Build/coverage/unit.cov Tests/Unit"
], ],
"ci:json:lint": "find . ! -path '*/.cache/*' ! -path '*/.Build/*' ! -path '*/node_modules/*' -name '*.json' | xargs -r php .Build/bin/jsonlint -q", "ci:json:lint": "find . ! -path '*/.cache/*' ! -path '*/.Build/*' ! -path '*/node_modules/*' -name '*.json' | xargs -r php .Build/bin/jsonlint -q",
"ci:php": [ "ci:php": [
@ -152,9 +152,9 @@
"ci:tests:create-directories": "mkdir -p .Build/Web/typo3temp/var/tests", "ci:tests:create-directories": "mkdir -p .Build/Web/typo3temp/var/tests",
"ci:tests:functional": [ "ci:tests:functional": [
"@ci:tests:create-directories", "@ci:tests:create-directories",
"find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/bin/phpunit -c ./Tests/Functional/FunctionalTests.xml {}';" "find 'Tests/Functional' -wholename '*Test.php' | parallel --gnu 'echo; echo \"Running functional test suite {}\"; .Build/bin/phpunit -c ./Configuration/FunctionalTests.xml {}';"
], ],
"ci:tests:unit": ".Build/bin/phpunit -c ./Tests/Unit/UnitTests.xml Tests/Unit", "ci:tests:unit": ".Build/bin/phpunit -c ./Configuration/UnitTests.xml Tests/Unit",
"ci:ts:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript", "ci:ts:lint": "typoscript-lint -c Configuration/TsLint.yml --ansi -n --fail-on-warnings -vvv Configuration/TypoScript",
"ci:xliff:lint": "php Build/bin/console lint:xliff Resources/Private/Language", "ci:xliff:lint": "php Build/bin/console lint:xliff Resources/Private/Language",
"ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' -regextype egrep -regex '.*.ya?ml$' | xargs -r php ./.Build/bin/yaml-lint", "ci:yaml:lint": "find . ! -path '*.Build/*' ! -path '*node_modules/*' -regextype egrep -regex '.*.ya?ml$' | xargs -r php ./.Build/bin/yaml-lint",
@ -190,6 +190,8 @@
"rm .gitignore", "rm .gitignore",
"rm .php-cs-fixer.php", "rm .php-cs-fixer.php",
"rm .prettierrc.js", "rm .prettierrc.js",
"rm Configuration/FunctionalTests.xml",
"rm Configuration/UnitTests.xml",
"rm package.json", "rm package.json",
"rm phive.xml", "rm phive.xml",
"rm phpcs.xml", "rm phpcs.xml",