Automatically set up test environment, improve config

Author: JanJakes

.github/workflows/wp-tests-end-to-end.yml

@@ -27,12 +27,6 @@ jobs:
       - name: Install Playwright browsers
         run: npx playwright install --with-deps
 
-      - name: Setup WordPress test environment
-        run: composer run wp-setup
-
-      - name: Start WordPress test environment
-        run: composer run wp-test-start
-
       - name: Run WordPress end-to-end tests
         run: composer run wp-test-e2e
 

.github/workflows/wp-tests-phpunit.yml

@@ -24,12 +24,6 @@ jobs:
           echo "PHP_FPM_UID=$(id -u)" >> $GITHUB_ENV
           echo "PHP_FPM_GID=$(id -g)" >> $GITHUB_ENV
 
-      - name: Setup WordPress test environment
-        run: composer run wp-setup
-
-      - name: Start WordPress test environment
-        run: composer run wp-test-start
-
       - name: Run WordPress PHPUnit tests
         run: node .github/workflows/wp-tests-phpunit-run.js
 

composer.json

@@ -51,14 +51,23 @@
 			"npm --prefix wordpress run env:cli -- plugin install gutenberg",
 			"npm --prefix wordpress run env:cli -- plugin install query-monitor"
 		],
+		"wp-test-ensure-env": [
+			"if [ ! -f wordpress/src/wp-load.php ]; then composer run wp-setup; fi",
+			"@putenv COMPOSE_IGNORE_ORPHANS=true",
+			"cd wordpress && if [ -z \"$(node tools/local-env/scripts/docker.js ps -q)\" ]; then cd ..; composer run wp-test-start; fi"
+		],
 		"wp-test-php": [
-			"rm -rf wordpress/src/wp-content/database && npm --prefix wordpress run test:php --"
+			"@wp-test-ensure-env @no_additional_args",
+			"rm -rf wordpress/src/wp-content/database/.ht.sqlite @no_additional_args",
+			"npm --prefix wordpress run test:php -- @additional_args"
 		],
 		"wp-test-e2e": [
-			"npm --prefix wordpress run test:e2e --"
+			"@wp-test-ensure-env @no_additional_args",
+			"npm --prefix wordpress run test:e2e -- @additional_args"
 		],
 		"wp-test-clean": [
-			"npm --prefix wordpress run env:clean"
+			"npm --prefix wordpress run env:clean",
+			"rm -rf wordpress/src/wp-content/database/.ht.sqlite"
 		]
 	}
 }