From 36596d135afb50bda409d988e2df94acffb51b65 Mon Sep 17 00:00:00 2001
From: barbun <robarcover@gmail.com>
Date: Tue, 25 Aug 2026 23:27:56 +1000
Subject: [PATCH 1/2] Added development dependencies to the Test image.

---
 .docker/Dockerfile.test |  5 ++++-
 composer.json           | 11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.docker/Dockerfile.test b/.docker/Dockerfile.test
index b2458c7ed..28c81718e 100644
--- a/.docker/Dockerfile.test
+++ b/.docker/Dockerfile.test
@@ -30,8 +30,11 @@ COPY .docker/images/govcms/mariadb-client.cnf /etc/my.cnf.d
 # Copy application files from the 'cli' stage to the current stage
 COPY --from=cli /app /app
 
+# Install dev dependencies (e.g. PHPUnit) excluded from the CLI image.
+RUN composer install --dev
+
 # Copy PHPUnit configuration and test files
-COPY --from=govcmstesting/tests:3.2.3-php8.3 /tests /app/tests
+COPY tests /app/tests
 
 # Set an environment variable for the webroot path
 ENV WEBROOT=web
diff --git a/composer.json b/composer.json
index 5fab2017f..7c45e0b17 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,16 @@
     },
     "require-dev": {
         "drupal/core-dev": "^11.0",
-        "palantirnet/drupal-rector": "^0.20.3"
+        "behat/behat": "^3.32",
+        "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
+        "drevops/behat-format-progress-fail": "^1.5",
+        "drevops/behat-screenshot": "^2.6",
+        "drevops/behat-steps": "^3.0",
+        "drupal/coder": "^8.3",
+        "drupal/drupal-extension": "^6.0",
+        "php-parallel-lint/php-console-highlighter": "^1.0",
+        "php-parallel-lint/php-parallel-lint": "^1.3",
+        "phpmd/phpmd": "^2.15"
     },
     "conflict": {
         "drupal/drupal": "*"

From 47f4cd6bee6a33d489528b1154739ef4d015e28b Mon Sep 17 00:00:00 2001
From: barbun <robarcover@gmail.com>
Date: Tue, 25 Aug 2026 23:34:38 +1000
Subject: [PATCH 2/2] Added missing test traits.

---
 composer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7c45e0b17..0f589a863 100644
--- a/composer.json
+++ b/composer.json
@@ -29,9 +29,11 @@
         "drevops/behat-steps": "^3.0",
         "drupal/coder": "^8.3",
         "drupal/drupal-extension": "^6.0",
+        "palantirnet/drupal-rector": "^0.20",
         "php-parallel-lint/php-console-highlighter": "^1.0",
         "php-parallel-lint/php-parallel-lint": "^1.3",
-        "phpmd/phpmd": "^2.15"
+        "phpmd/phpmd": "^2.15",
+        "weitzman/drupal-test-traits": "^2.0"
     },
     "conflict": {
         "drupal/drupal": "*"