From 260a57dc5282e95ab25cd533d053314d821c89f3 Mon Sep 17 00:00:00 2001
From: "Christopher C. Wells" <git@chris-wells.net>
Date: Fri, 9 Apr 2021 14:46:40 -0700
Subject: [PATCH] Refactor testing configurations

---
 .env.local.example | 13 ++-----------
 docker-compose.yml | 18 +++++++++++++++---
 phpunit.xml.dist   |  4 +++-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.env.local.example b/.env.local.example
index 2984803..47bf9f3 100644
--- a/.env.local.example
+++ b/.env.local.example
@@ -2,9 +2,9 @@ APP_NAME=kcal
 APP_ENV=local
 APP_KEY=
 APP_DEBUG=true
-APP_URL=http://127.0.0.1
+APP_URL=http://kcal.test
 APP_PORT=8080
-APP_SERVICE=kcal.test
+APP_SERVICE=app
 APP_TIMEZONE=UTC
 
 LOG_CHANNEL=stack
@@ -17,17 +17,8 @@ DB_DATABASE=kcal
 DB_USERNAME=kcal
 DB_PASSWORD=kcal
 
-#REDIS_URL=
 REDIS_HOST=redis
-#REDIS_PASSWORD=
 REDIS_PORT=6379
-#REDIS_DB=
-
-#SCOUT_DRIVER=null
-
-#SCOUT_DRIVER=algolia
-#ALGOLIA_APP_ID=
-#ALGOLIA_SECRET=
 
 SCOUT_DRIVER=elastic
 ELASTIC_HOST=elasticsearch:9200
diff --git a/docker-compose.yml b/docker-compose.yml
index 3f442a1..f603791 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 # For more information: https://laravel.com/docs/sail
 version: '3'
 services:
-  kcal.test:
+  app:
     build:
       context: ./vendor/laravel/sail/runtimes/8.0
       dockerfile: Dockerfile
@@ -18,10 +18,10 @@ services:
     networks:
       - sail
     depends_on:
-      - mysql
+      - db
       - redis
       - elasticsearch
-  mysql:
+  db:
     image: 'mysql:8.0'
     ports:
       - '${DB_PORT:-3306}:3306'
@@ -35,6 +35,18 @@ services:
       - 'mysql-data:/var/lib/mysql'
     networks:
       - sail
+  phpmyadmin:
+    image: phpmyadmin
+    restart: always
+    ports:
+      - 8080:80
+    environment:
+      PMA_HOST: db
+      MYSQL_ROOT_PASSWORD: '${DB_PASSWORD:-kcal}'
+    networks:
+      - sail
+    depends_on:
+      - db
   elasticsearch:
     image: 'elasticsearch:7.12.0'
     environment:
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f28d070..d59b141 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -23,11 +23,13 @@
         <server name="CACHE_DRIVER" value="array"/>
         <server name="DB_CONNECTION" value="sqlite"/>
         <server name="DB_DATABASE" value=":memory:"/>
-        <server name="ELASTIC_HOST" value="localhost:9200"/>
         <server name="MAIL_MAILER" value="array"/>
         <server name="QUEUE_CONNECTION" value="sync"/>
         <server name="SESSION_DRIVER" value="elastic"/>
         <server name="SESSION_DRIVER" value="array"/>
         <server name="TELESCOPE_ENABLED" value="false"/>
+
+        <!-- Configuration below assumes tests are running from Sail. -->
+        <server name="ELASTIC_HOST" value="elasticsearch:9200"/>
     </php>
 </phpunit>