From 2901fe8b7b5bb803d6a1bf87197d518a2935f55f Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Thu, 24 Oct 2024 11:50:06 +0200
Subject: [PATCH] Reduce duplication in CLI tests

---
 bin/test/run-cli-tests.sh   | 5 ++++-
 composer.json               | 4 ++--
 config/test/shlink-test.env | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/test/run-cli-tests.sh b/bin/test/run-cli-tests.sh
index c97f8705..96ea6cfa 100755
--- a/bin/test/run-cli-tests.sh
+++ b/bin/test/run-cli-tests.sh
@@ -2,7 +2,10 @@
 
 export APP_ENV=test
 export TEST_ENV=cli
-export DB_DRIVER=maria
+export DB_DRIVER="${DB_DRIVER:-"maria"}"
+export GENERATE_COVERAGE="${GENERATE_COVERAGE:-"no"}"
+
+[ "$GENERATE_COVERAGE" != 'no' ] && export XDEBUG_MODE=coverage
 
 # Load and export test env vars
 set -a
diff --git a/composer.json b/composer.json
index 50633ca1..3e2a089d 100644
--- a/composer.json
+++ b/composer.json
@@ -137,8 +137,8 @@
         "test:api:ci": "GENERATE_COVERAGE=yes composer test:api && vendor/bin/phpcov merge build/coverage-api --php build/coverage-api.cov && rm build/coverage-api/*.cov",
         "test:api:pretty": "GENERATE_COVERAGE=yes composer test:api && vendor/bin/phpcov merge build/coverage-api --html build/coverage-api/coverage-html && rm build/coverage-api/*.cov",
         "test:cli": "bin/test/run-cli-tests.sh",
-        "test:cli:ci": "XDEBUG_MODE=coverage GENERATE_COVERAGE=yes composer test:cli && vendor/bin/phpcov merge build/coverage-cli --php build/coverage-cli.cov && rm build/coverage-cli/*.cov",
-        "test:cli:pretty": "XDEBUG_MODE=coverage GENERATE_COVERAGE=yes composer test:cli && vendor/bin/phpcov merge build/coverage-cli --html build/coverage-cli/coverage-html && rm build/coverage-cli/*.cov",
+        "test:cli:ci": "GENERATE_COVERAGE=yes composer test:cli && vendor/bin/phpcov merge build/coverage-cli --php build/coverage-cli.cov && rm build/coverage-cli/*.cov",
+        "test:cli:pretty": "GENERATE_COVERAGE=yes composer test:cli && vendor/bin/phpcov merge build/coverage-cli --html build/coverage-cli/coverage-html && rm build/coverage-cli/*.cov",
         "swagger:validate": "php-openapi validate docs/swagger/swagger.json",
         "swagger:inline": "php-openapi inline docs/swagger/swagger.json docs/swagger/swagger-inlined.json",
         "clean:dev": "rm -f data/database.sqlite && rm -f config/params/generated_config.php"
diff --git a/config/test/shlink-test.env b/config/test/shlink-test.env
index a7126e10..48af9b6e 100644
--- a/config/test/shlink-test.env
+++ b/config/test/shlink-test.env
@@ -1,3 +1,5 @@
+APP_ENV=test
+
 # URL shortener
 DEFAULT_DOMAIN=s.test
 IS_HTTPS_ENABLED=false