From d2020eb7d809f02c27333f7f7be1321ead224f11 Mon Sep 17 00:00:00 2001
From: Hugo Sales <hugo@hsal.es>
Date: Wed, 5 May 2021 12:15:05 +0000
Subject: [PATCH] [TOOLS][TESTS] Adjust configuration for testing environment

---
 .env.test                          | 2 +-
 docker/testing/coverage.sh         | 6 +++++-
 docker/testing/docker-compose.yaml | 4 ----
 docker/testing/social.env          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.env.test b/.env.test
index ddc5b49bb4..aca3bae320 100644
--- a/.env.test
+++ b/.env.test
@@ -3,4 +3,4 @@ KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
 PANTHER_APP_ENV=panther
-DATABASE_URL=postgresql://postgres:password@db:54320/social
+DATABASE_URL=postgresql://postgres:password@db:5432/social
diff --git a/docker/testing/coverage.sh b/docker/testing/coverage.sh
index b9c7720d71..6bd42f44ec 100755
--- a/docker/testing/coverage.sh
+++ b/docker/testing/coverage.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 
-if /var/www/social/bin/phpunit --coverage-html .test_coverage_report; then
+cd /var/www/social || exit 65
+
+yes yes | php bin/console doctrine:fixtures:load || exit 65
+
+if bin/phpunit --coverage-html .test_coverage_report; then
     exit 64
 else
     exit 65
diff --git a/docker/testing/docker-compose.yaml b/docker/testing/docker-compose.yaml
index 6f733cc2e5..323b3e1b80 100644
--- a/docker/testing/docker-compose.yaml
+++ b/docker/testing/docker-compose.yaml
@@ -22,8 +22,6 @@ services:
 
     db:
         image: postgres:alpine
-        ports:
-            - 54320:5432
         environment:
             - PGDATA=/var/lib/postgres/data
         env_file:
@@ -34,8 +32,6 @@ services:
     redis:
         image: redis:alpine
         tty: false
-        ports:
-            - 63790:6379
 
 volumes:
     database:
diff --git a/docker/testing/social.env b/docker/testing/social.env
index f1558adfb3..914664fea8 100644
--- a/docker/testing/social.env
+++ b/docker/testing/social.env
@@ -1,5 +1,5 @@
 SOCIAL_DBMS=postgres
-SOCIAL_DB=social
+SOCIAL_DB=test
 SOCIAL_USER=postgres
 SOCIAL_PASSWORD=password
 SOCIAL_DOMAIN=social.localhost