From 62c49cac6db810058bf6488a778a2cc05297f840 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 21 Dec 2022 10:11:27 +1300 Subject: [PATCH 1/4] 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": [ From ed70400f9cc886de6e7e53830847cb1265ad190d Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 21 Dec 2022 11:08:24 +1300 Subject: [PATCH 2/4] DEP Stabilise requirements --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 902f2e5..4da73f1 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "4.12.x-dev", + "silverstripe/recipe-cms": "~4.12.0@stable", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "4.8.x-dev" + "silverstripe/login-forms": "~4.8.0@stable" }, "require-dev": { "phpunit/phpunit": "^9.5" From f10a0206af5c3447a1d28c5051fd6c18ba99ebe7 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 21 Dec 2022 13:11:39 +1300 Subject: [PATCH 3/4] MNT Update development dependencies (#346) --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 4da73f1..902f2e5 100644 --- a/composer.json +++ b/composer.json @@ -5,9 +5,9 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-cms": "~4.12.0@stable", + "silverstripe/recipe-cms": "4.12.x-dev", "silverstripe-themes/simple": "~3.2.0", - "silverstripe/login-forms": "~4.8.0@stable" + "silverstripe/login-forms": "4.8.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From 44a3fdb0eabe110417a4d21f0906263d3b2ec5ee Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 26 Jan 2023 10:20:05 +1300 Subject: [PATCH 4/4] MNT Test additional modules --- phpunit.xml.dist | 4 ++++ 1 file changed, 4 insertions(+) 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/