Merge branch '4.12' into 4

This commit is contained in:
Steve Boyd 2023-02-02 16:37:27 +13:00
commit 5e497fa85f
4 changed files with 9 additions and 3 deletions

1
.gitattributes vendored
View File

@ -1,3 +1,4 @@
.github export-ignore
.cow.json export-ignore .cow.json export-ignore
.cow export-ignore .cow export-ignore
.gitattributes export-ignore .gitattributes export-ignore

View File

@ -17,6 +17,9 @@ jobs:
with: with:
# installer contains a sample behat.yml file, though there are no behat tests to run # installer contains a sample behat.yml file, though there are no behat tests to run
endtoend: false endtoend: false
# require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike
# regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer`
composer_require_extra: silverstripe/recipe-testing:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10
extra_jobs: | extra_jobs: |
- endtoend: true - endtoend: true
endtoend_suite: admin endtoend_suite: admin

View File

@ -10,9 +10,7 @@
"silverstripe/login-forms": "4.x-dev" "silverstripe/login-forms": "4.x-dev"
}, },
"require-dev": { "require-dev": {
"silverstripe/recipe-testing": "^2", "phpunit/phpunit": "^9.5"
"silverstripe/frameworktest": "^0.4.2",
"mikey179/vfsstream": "^1.6.10"
}, },
"extra": { "extra": {
"project-files": [ "project-files": [

View File

@ -43,7 +43,11 @@
<directory>vendor/silverstripe/asset-admin/tests/php/</directory> <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
<directory>vendor/silverstripe/campaign-admin/tests/php/</directory> <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
<directory>vendor/silverstripe/cms/tests/</directory> <directory>vendor/silverstripe/cms/tests/</directory>
<directory>vendor/silverstripe/config/tests/</directory>
<directory>vendor/silverstripe/errorpage/tests/</directory>
<directory>vendor/silverstripe/graphql/tests/</directory> <directory>vendor/silverstripe/graphql/tests/</directory>
<directory>vendor/silverstripe/login-forms/tests/php/</directory>
<directory>vendor/silverstripe/mimevalidator/tests/</directory>
<directory>vendor/silverstripe/reports/tests/</directory> <directory>vendor/silverstripe/reports/tests/</directory>
<directory>vendor/silverstripe/siteconfig/tests/php/</directory> <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
</testsuite> </testsuite>