diff --git a/.ci/.env.ci b/.ci/.env.ci index 7bdf5582eb..2fb9b1975c 100644 --- a/.ci/.env.ci +++ b/.ci/.env.ci @@ -60,7 +60,7 @@ APP_LOG_LEVEL=info # Use "pgsql" for PostgreSQL # Use "mysql" for MySQL and MariaDB. # Use "sqlite" for SQLite. -DB_CONNECTION=sqlite_test +DB_CONNECTION=sqlite # MySQL supports SSL. You can configure it here. # If you use Docker or similar, you can set these variables from a file by appending them with _FILE @@ -127,7 +127,6 @@ MAIL_ENCRYPTION=null MAILGUN_DOMAIN= MAILGUN_SECRET= - # If you are on EU region in mailgun, use api.eu.mailgun.net, otherwise use api.mailgun.net # If you use Docker or similar, you can set this variable from a file by appending it with _FILE MAILGUN_ENDPOINT=api.mailgun.net @@ -136,7 +135,6 @@ MAILGUN_ENDPOINT=api.mailgun.net MANDRILL_SECRET= SPARKPOST_SECRET= - # Firefly III can send you the following messages SEND_REGISTRATION_MAIL=true SEND_ERROR_MESSAGE=true @@ -223,7 +221,6 @@ ADLDAP_ADMIN_PASSWORD= ADLDAP_ACCOUNT_PREFIX= ADLDAP_ACCOUNT_SUFFIX= - # LDAP authentication settings. ADLDAP_PASSWORD_SYNC=false ADLDAP_LOGIN_FALLBACK=false diff --git a/.ci/phpunit.sh b/.ci/phpunit.sh index e7c47d109c..4dd50e63aa 100755 --- a/.ci/phpunit.sh +++ b/.ci/phpunit.sh @@ -25,9 +25,7 @@ cp .ci/.env.ci ../.env # download test database # TODO no longer exists -wget --quiet https://raw.githubusercontent.com/firefly-iii/test-data/main/test_db.sqlite -o storage/database/test_db.sqlite +#wget https://raw.githubusercontent.com/firefly-iii/test-data/main/test_database.sqlite -o storage/database/database.sqlite # run phpunit -./vendor/bin/phpunit --configuration phpunit.coverage.xml - -exit 0 +./vendor/bin/phpunit --configuration phpunit.xml diff --git a/config/database.php b/config/database.php index 0ea963ea83..87371d7b43 100644 --- a/config/database.php +++ b/config/database.php @@ -80,11 +80,6 @@ return [ 'database' => envNonEmpty('DB_DATABASE', storage_path('database/database.sqlite')), 'prefix' => '', ], - 'sqlite_test' => [ - 'driver' => 'sqlite', - 'database' => envNonEmpty('DB_DATABASE', storage_path('database/test_db.sqlite')), - 'prefix' => '', - ], 'mysql' => [ 'driver' => 'mysql', 'host' => envNonEmpty('DB_HOST', $host), diff --git a/phpunit.xml b/phpunit.xml index b671226ef8..37827d6137 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -37,29 +37,6 @@ ./tests - -