Skip to content

Commit

Permalink
Fix test suites
Browse files Browse the repository at this point in the history
  • Loading branch information
@justafish
justafish committed Aug 9, 2024
1 parent 914940c commit accdda3
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 24 deletions.
42 changes: 30 additions & 12 deletions scaffold/phpunit-testtraits.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,28 +58,46 @@
</extensions>
<testsuites>
<testsuite name="unit">
<directory>../../../../web/modules/custom/**/tests/src/Unit</directory>
<directory>../../../../web/themes/custom/**/tests/src/Unit</directory>
<directory>../../../../web/profiles/custom/**/tests/src/Unit</directory>
<directory>../../../../web/modules/custom/*/tests/src/Unit</directory>
<directory>../../../../web/modules/custom/*/*/tests/src/Unit</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/Unit</directory>
<directory>../../../../web/themes/custom/*/tests/src/Unit</directory>
<directory>../../../../web/themes/custom/*/*/tests/src/Unit</directory>
<directory>../../../../web/profiles/custom/*/tests/src/Unit</directory>
<directory>../../../../web/profiles/custom/*/*/tests/src/Unit</directory>
<directory>../../../../test/phpunit/*/Unit</directory>
</testsuite>
<testsuite name="kernel">
<directory>../../../../web/modules/custom/**/tests/src/Kernel</directory>
<directory>../../../../web/themes/custom/**/tests/src/Kernel</directory>
<directory>../../../../web/profiles/custom/**/tests/src/Kernel</directory>
<directory>../../../../web/modules/custom/*/tests/src/Kernel</directory>
<directory>../../../../web/modules/custom/*/*/tests/src/Kernel</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/Kernel</directory>
<directory>../../../../test/phpunit/*/Kernel</directory>
</testsuite>
<testsuite name="functional">
<directory>../../../../web/modules/custom/**/tests/src/Functional</directory>
<directory>../../../../web/themes/custom/**/tests/src/Functional</directory>
<directory>../../../../web/profiles/custom/**/tests/src/Functional</directory>
<directory>../../../../web/modules/custom/*/tests/src/Functional</directory>
<directory>../../../../web/modules/custom/*/*/tests/src/Functional</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/Functional</directory>
<directory>../../../../test/phpunit/*/Functional</directory>
</testsuite>
<testsuite name="functional-javascript">
<directory>../../../../web/modules/custom/**/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/themes/custom/**/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/profiles/custom/**/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/modules/custom/*/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/modules/custom/*/*/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/FunctionalJavaScript</directory>
<directory>../../../../test/phpunit/*/FunctionalJavaScript</directory>
</testsuite>
<testsuite name="existing-site">
<!-- Assumes tests are namespaced as \Drupal\Tests\custom_foo\ExistingSite. -->
<directory>../../../../web/modules/custom/*/tests/src/ExistingSite</directory>
<directory>../../../../test/phpunit/*/ExistingSite</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/ExistingSite</directory>
<directory>../../../../test/phpunit/*/ExistingSite</directory>
</testsuite>
<testsuite name="existing-site-javascript">
<!-- Assumes tests are namespaced as \Drupal\Tests\custom_foo\ExistingSiteJavascript. -->
<directory>../../../../web/modules/custom/*/tests/src/ExistingSiteJavascript</directory>
<directory>../../../../test/phpunit/*/ExistingSiteJavascript</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/ExistingSiteJavaScript</directory>
<directory>../../../../test/phpunit/*/ExistingSiteJavaScript</directory>
</testsuite>
</testsuites>
</phpunit>
25 changes: 13 additions & 12 deletions scaffold/phpunit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,27 +55,28 @@
</extensions>
<testsuites>
<testsuite name="unit">
<directory>../../../../web/modules/custom/**/tests/src/Unit</directory>
<directory>../../../../web/themes/custom/**/tests/src/Unit</directory>
<directory>../../../../web/profiles/custom/**/tests/src/Unit</directory>

<directory>../../../../web/modules/custom/*/tests/src/Unit</directory>
<directory>../../../../web/modules/custom/*/*/tests/src/Unit</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/Unit</directory>
<directory>../../../../test/phpunit/*/Unit</directory>
</testsuite>
<testsuite name="kernel">
<directory>../../../../web/modules/custom/**/tests/src/Kernel</directory>
<directory>../../../../web/themes/custom/**/tests/src/Kernel</directory>
<directory>../../../../web/profiles/custom/**/tests/src/Kernel</directory>
<directory>../../../../web/modules/custom/*/tests/src/Kernel</directory>
<directory>../../../../web/modules/custom/*/*/tests/src/Kernel</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/Kernel</directory>
<directory>../../../../test/phpunit/*/Kernel</directory>
</testsuite>
<testsuite name="functional">
<directory>../../../../web/modules/custom/**/tests/src/Functional</directory>
<directory>../../../../web/themes/custom/**/tests/src/Functional</directory>
<directory>../../../../web/profiles/custom/**/tests/src/Functional</directory>
<directory>../../../../web/modules/custom/*/tests/src/Functional</directory>
<directory>../../../../web/modules/custom/*/*/tests/src/Functional</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/Functional</directory>
<directory>../../../../test/phpunit/*/Functional</directory>
</testsuite>
<testsuite name="functional-javascript">
<directory>../../../../web/modules/custom/**/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/themes/custom/**/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/profiles/custom/**/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/modules/custom/*/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/modules/custom/*/*/tests/src/FunctionalJavaScript</directory>
<directory>../../../../web/modules/custom/*/modules/*/tests/src/FunctionalJavaScript</directory>
<directory>../../../../test/phpunit/*/FunctionalJavaScript</directory>
</testsuite>
</testsuites>
Expand Down

0 comments on commit accdda3

Please sign in to comment.