diff --git a/.gitattributes b/.gitattributes index 3f2077e..a31a66e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ +.github export-ignore .cow.json export-ignore .cow export-ignore .gitattributes export-ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3b8ad97..74f20d7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,9 @@ jobs: with: # installer contains a sample behat.yml file, though there are no behat tests to run 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: | - endtoend: true endtoend_suite: admin diff --git a/composer.json b/composer.json index d3c70b4..0420941 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,7 @@ "silverstripe/login-forms": "4.x-dev" }, "require-dev": { - "silverstripe/recipe-testing": "^2", - "silverstripe/frameworktest": "^0.4.2", - "mikey179/vfsstream": "^1.6.10" + "phpunit/phpunit": "^9.5" }, "extra": { "project-files": [ diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 7b04144..a83245f 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -43,7 +43,11 @@ vendor/silverstripe/asset-admin/tests/php/ vendor/silverstripe/campaign-admin/tests/php/ vendor/silverstripe/cms/tests/ + vendor/silverstripe/config/tests/ + vendor/silverstripe/errorpage/tests/ vendor/silverstripe/graphql/tests/ + vendor/silverstripe/login-forms/tests/php/ + vendor/silverstripe/mimevalidator/tests/ vendor/silverstripe/reports/tests/ vendor/silverstripe/siteconfig/tests/php/