From 62c49cac6db810058bf6488a778a2cc05297f840 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 21 Dec 2022 10:11:27 +1300 Subject: [PATCH] FIX Move test requirements out of require-dev --- .gitattributes | 1 + .github/workflows/ci.yml | 3 +++ composer.json | 4 +--- 3 files changed, 5 insertions(+), 3 deletions(-) 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 715bfff..902f2e5 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,7 @@ "silverstripe/login-forms": "4.8.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": [