fixing tests

Leantime · Nov 13, 2024 · 02c4b9b · 02c4b9b
1 parent 401c8fb
commit 02c4b9b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/.dev/dev-apache-site.conf b/.dev/dev-apache-site.conf
@@ -2,8 +2,8 @@
 	ServerAdmin webmaster@localhost
 	DocumentRoot /var/www/html/public
 
-	ErrorLog /var/www/html/logs/apacheError.log
-	CustomLog /var/www/html/logs/access.log combined
+	ErrorLog /var/www/html/storage/logs/apacheError.log
+	CustomLog /var/www/html/storage/logs/access.log combined
 </VirtualHost>
 
 <VirtualHost *:443>
@@ -16,6 +16,6 @@
 
     SetEnv HTTPS "on"
 
-	ErrorLog /var/www/html/logs/apacheError.log
-	CustomLog /var/www/html/logs/access.log combined
+	ErrorLog /var/www/html/storage/logs/apacheError.log
+	CustomLog /var/www/html/storage/logs/access.log combined
 </VirtualHost>
diff --git a/.dev/dev-apache2.conf b/.dev/dev-apache2.conf
@@ -131,7 +131,7 @@ HostnameLookups Off
 # logged here.  If you *do* define an error logfile for a <VirtualHost>
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog /var/www/html/logs/apacheError.log
+ErrorLog /var/www/html/storage/logs/apacheError.log
 
 #
 # LogLevel: Control the severity of messages logged to the error_log.

diff --git a/.dev/docker-compose.tests.yaml b/.dev/docker-compose.tests.yaml
@@ -2,9 +2,6 @@
 # This docker compose file is used to build the environment for our testing framework in codeception
 # It is not to be used for development
 #
-
-version: "3.9"
-
 services:
   leantime-dev:
     volumes:
@@ -21,7 +18,9 @@ services:
       LEAN_DB_PASSWORD: 'leantime'
       LEAN_DB_DATABASE: 'leantime_test'
       LEAN_DB_PORT: '3306'
-
+    depends_on:
+      db:
+        condition: service_healthy
   db:
     environment:
       MYSQL_DATABASE: leantime_test
diff --git a/.dev/docker-compose.yaml b/.dev/docker-compose.yaml
@@ -1,14 +1,10 @@
-version: "3.9"
-
 networks:
   leantime:
       external: false
       driver: bridge
-
 volumes:
   mysql:
   s3ninja-data:
-
 services:
   leantime-dev:
     build: .
@@ -38,7 +34,6 @@ services:
       - "6379"
     networks:
       - leantime
-
   db:
     image: mysql:8.0
     ports:
@@ -69,7 +64,6 @@ services:
       - "7900"
     networks:
       - leantime
-
   maildev:
     image: maildev/maildev
     environment:
@@ -79,7 +73,6 @@ services:
       - "8081"
     networks:
       - leantime
-
   phpmyadmin:
     image: phpmyadmin
     ports:
@@ -89,7 +82,6 @@ services:
       - PMA_PORT=3306
     networks:
       - leantime
-
   s3ninja:
     image: scireum/s3-ninja
     ports:

diff --git a/tests/Unit/app/Core/UI/ThemeTest.php b/tests/Unit/app/Core/UI/ThemeTest.php
@@ -32,6 +32,10 @@ protected function setUp(): void
 
         parent::setUp();
 
+        if (! defined('BASE_URL')) {
+            define('BASE_URL', 'http://localhost');
+        }
+
         $this->settingsRepoMock = $this->make(Setting::class, [
 
         ]);