diff --git a/.gitignore b/.gitignore index 72e5ffada..9bde27dbc 100644 --- a/.gitignore +++ b/.gitignore @@ -26,9 +26,9 @@ /web/bundles/ /web/uploads/ -# PHPUnit -/app/phpunit.xml -/phpunit.xml +# Build +/app/build +/build # Composer PHAR /composer.phar diff --git a/.travis.yml b/.travis.yml index e99c1e6f2..ff23ad457 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,5 +14,5 @@ before_script: - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini script: - - ant -f app/build.xml prepare - - phpunit -c app --coverage-text + - ant prepare + - phpunit --coverage-text diff --git a/app/build.xml b/build.xml similarity index 80% rename from app/build.xml rename to build.xml index bdc4b4d86..cd2dfa3c8 100644 --- a/app/build.xml +++ b/build.xml @@ -11,31 +11,30 @@ - - + - + - + - + - + diff --git a/app/phpunit.xml.dist b/phpunit.xml.dist similarity index 56% rename from app/phpunit.xml.dist rename to phpunit.xml.dist index b8f38ff89..6f6269a4c 100644 --- a/app/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -9,23 +9,27 @@ processIsolation="false" stopOnFailure="false" syntaxCheck="false" - bootstrap="bootstrap.php.cache" + bootstrap="app/bootstrap.php.cache" > - ../src/Wallabag/CoreBundle/Tests + ./src/Wallabag/*Bundle/Tests + + + + - ../src + ./src - ../vendor - ../src/Wallabag/CoreBundle/Resources - ../src/Wallabag/CoreBundle/Tests - ../src/Wallabag/CoreBundle/DataFixtures + ./vendor + ./src/Wallabag/*Bundle/Resources + ./src/Wallabag/*Bundle/Tests + ./src/Wallabag/*Bundle/DataFixtures