diff --git a/.gitignore b/.gitignore index 88e1243..d27e5c8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ composer.lock .phpunit.result.cache test.php test.sqlite +*.test.sqlite .DS_Store diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cc32d0d..3c97b51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,11 @@ -image: php:7.1-alpine +image: php:7.1-alpine + +services: + - mysql:latest + +variables: + MYSQL_DATABASE: destructr_test + MYSQL_ROOT_PASSWORD: badpassword before_script: - apk update @@ -11,10 +18,10 @@ test:local: script: - php composer.phar test-local -# test:db: -# script: -# - docker-php-ext-install pdo_mysql -# - php composer.phar test-db +test:drivers: + script: + - docker-php-ext-install pdo_mysql + - php composer.phar test-mysql test:sqlite: script: diff --git a/composer.json b/composer.json index 3f0f156..886366b 100644 --- a/composer.json +++ b/composer.json @@ -21,8 +21,8 @@ "test-local": [ "phpunit --testsuite Local" ], - "test-db": [ - "phpunit --testsuite DB" + "test-mysql": [ + "phpunit --testsuite MySQL" ], "test-sqlite": [ "phpunit --testsuite SQLite" diff --git a/phpunit.xml b/phpunit.xml index 1ff42a1..2264fee 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -5,8 +5,8 @@ tests/Drivers tests/LegacyDrivers - - tests/Drivers + + tests/Drivers/MySQL tests/LegacyDrivers/SQLite diff --git a/tests/Drivers/IntegrationTests/AbstractDriverIntegrationTest.php b/tests/Drivers/AbstractDriverIntegrationTest.php similarity index 99% rename from tests/Drivers/IntegrationTests/AbstractDriverIntegrationTest.php rename to tests/Drivers/AbstractDriverIntegrationTest.php index 69df76a..9f546f3 100644 --- a/tests/Drivers/IntegrationTests/AbstractDriverIntegrationTest.php +++ b/tests/Drivers/AbstractDriverIntegrationTest.php @@ -1,7 +1,7 @@