From 4300fb225f68f56a9fb45acbab717ddd0f59f9cd Mon Sep 17 00:00:00 2001 From: Alejandro Celaya <alejandro@alejandrocelaya.com> Date: Sun, 6 Oct 2019 12:23:02 +0200 Subject: [PATCH] Ensured tests on maria DB are not run on travis, since it would conflict with MySQL --- composer.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a8a95dba..3159566c 100644 --- a/composer.json +++ b/composer.json @@ -110,7 +110,7 @@ ], "test:ci": [ "@test:unit:ci", - "@test:db", + "@test:db:ci", "@test:api" ], "test:unit": "phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always --coverage-php build/coverage-unit.cov --testdox", @@ -121,6 +121,11 @@ "@test:db:maria", "@test:db:postgres" ], + "test:db:ci": [ + "@test:db:sqlite", + "@test:db:mysql", + "@test:db:postgres" + ], "test:db:sqlite": "APP_ENV=test phpdbg -qrr vendor/bin/phpunit --order-by=random --colors=always -c phpunit-db.xml --coverage-php build/coverage-db.cov --testdox", "test:db:mysql": "DB_DRIVER=mysql composer test:db:sqlite", "test:db:maria": "DB_DRIVER=maria composer test:db:sqlite", @@ -151,9 +156,11 @@ "test:ci": "<fg=blue;options=bold>Runs all test suites, generating all needed reports and logs for CI envs</>", "test:unit": "<fg=blue;options=bold>Runs unit test suites</>", "test:unit:ci": "<fg=blue;options=bold>Runs unit test suites, generating all needed reports and logs for CI envs</>", - "test:db": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL and PostgreSQL</>", + "test:db": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL, MariaDB and PostgreSQL</>", + "test:db:ci": "<fg=blue;options=bold>Runs database test suites on a SQLite, MySQL and PostgreSQL</>", "test:db:sqlite": "<fg=blue;options=bold>Runs database test suites on a SQLite database</>", "test:db:mysql": "<fg=blue;options=bold>Runs database test suites on a MySQL database</>", + "test:db:maria": "<fg=blue;options=bold>Runs database test suites on a MariaDB database</>", "test:db:postgres": "<fg=blue;options=bold>Runs database test suites on a PostgreSQL database</>", "test:api": "<fg=blue;options=bold>Runs API test suites</>", "test:pretty": "<fg=blue;options=bold>Runs all test suites and generates an HTML code coverage report</>",