From a37e407483b5b65967d72cc523a20133cf89d3ab Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Wed, 22 Jun 2022 11:32:40 +0000
Subject: [PATCH] chore: create test database on mariadb init + harmonize test
database credentials
---
.gitlab-ci.yml | 6 +++---
docker-compose.yml | 1 +
initdb/01.sql | 2 ++
phpunit.xml.dist | 6 +++---
4 files changed, 9 insertions(+), 6 deletions(-)
create mode 100644 initdb/01.sql
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 578045a96d..93c274a3c4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,10 +68,10 @@ tests:
services:
- mariadb
variables:
- MYSQL_DATABASE: "tests"
MYSQL_ROOT_PASSWORD: "R00Tp4ssW0RD"
- MYSQL_USER: "tests_user"
- MYSQL_PASSWORD: "password"
+ MYSQL_DATABASE: "test"
+ MYSQL_USER: "castopod"
+ MYSQL_PASSWORD: "castopod"
script:
- apt-get install -y mariadb-client libmariadb-dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 156539b2a3..667b511edf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -36,6 +36,7 @@ services:
ports:
- 3306:3306
volumes:
+ - ./initdb:/docker-entrypoint-initdb.d
- mariadb:/var/lib/mysql
environment:
MYSQL_ROOT_PASSWORD: root
diff --git a/initdb/01.sql b/initdb/01.sql
new file mode 100644
index 0000000000..2429cc61c5
--- /dev/null
+++ b/initdb/01.sql
@@ -0,0 +1,2 @@
+CREATE DATABASE IF NOT EXISTS `test`;
+GRANT ALL ON `test`.* TO 'castopod'@'%';
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index c6b5aa99f2..7395ebae2c 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -46,9 +46,9 @@
<const name="PUBLICPATH" value="./public/"/>
<!-- Database configuration -->
<env name="database.tests.hostname" value="mariadb"/>
- <env name="database.tests.database" value="tests"/>
- <env name="database.tests.username" value="tests_user"/>
- <env name="database.tests.password" value="password"/>
+ <env name="database.tests.database" value="test"/>
+ <env name="database.tests.username" value="castopod"/>
+ <env name="database.tests.password" value="castopod"/>
<env name="database.tests.DBDriver" value="MySQLi"/>
<env name="database.tests.DBPrefix" value="tests_"/>
<env name="REST_API_ENABLED" value="1"/>
--
GitLab