From: Nicolas LÅ“uillet Date: Sat, 28 Mar 2015 09:46:33 +0000 (+0100) Subject: Merge pull request #1163 from wallabag/v2-speed-up-tests X-Git-Tag: 2.0.0-alpha.0~72 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=bdf2add2e80dc52a02113c50636b5f887639b31a;hp=f37d1427a1b75f9d7a2e273b2e9fb0e895a769ab;p=github%2Fwallabag%2Fwallabag.git Merge pull request #1163 from wallabag/v2-speed-up-tests Speed up tests --- diff --git a/.scrutinizer.yml b/.scrutinizer.yml new file mode 100644 index 00000000..547120e6 --- /dev/null +++ b/.scrutinizer.yml @@ -0,0 +1,22 @@ +filter: + paths: + - src/* + excluded_paths: + - 'vendor/*' + - 'app/*' + - 'web/*' + - 'src/Wallabag/*Bundle/Tests/*' + - '*Test.php' + +tools: + php_cs_fixer: true + php_analyzer: true + php_mess_detector: true + php_changetracking: true + php_code_sniffer: true + php_pdepend: true + sensiolabs_security_checker: true + external_code_coverage: true + php_code_coverage: true + php_sim: false + php_cpd: false diff --git a/.travis.yml b/.travis.yml index ff23ad45..6e938826 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,45 @@ language: php +# faster builds on docker-container setup +sudo: false + +# cache vendor dirs +cache: + directories: + - vendor + - $HOME/.composer/cache + php: - - 5.4 - - 5.5 - - 5.6 + - 5.4 + - 5.5 + - 5.6 + - hhvm + - nightly + +matrix: + fast_finish: true + allow_failures: + - php: hhvm + - php: nightly branches: - only: - - v2 + only: + - v2 +install: + - composer self-update + +# build coverage only on one build, to speed up results feedbacks before_script: - - composer self-update - - echo 'date.timezone = "Europe/Paris"' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; fi; script: - - ant prepare - - phpunit --coverage-text + - ant prepare + - phpunit $PHPUNIT_FLAGS + +after_script: + - | + if [ $TRAVIS_PHP_VERSION = '5.6' ]; then + wget https://scrutinizer-ci.com/ocular.phar + php ocular.phar code-coverage:upload --format=php-clover coverage.clover + fi diff --git a/app/config/config_test.yml b/app/config/config_test.yml index a6ead1e8..32156963 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml @@ -20,3 +20,10 @@ doctrine: driver: pdo_sqlite path: %kernel.root_dir%/../data/db/wallabag_test.sqlite host: localhost + orm: + metadata_cache_driver: + type: service + id: filesystem_cache + query_cache_driver: + type: service + id: filesystem_cache diff --git a/app/config/services.yml b/app/config/services.yml index 91a03e10..af22d381 100644 --- a/app/config/services.yml +++ b/app/config/services.yml @@ -6,6 +6,8 @@ parameters: security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator services: -# service_name: -# class: AppBundle\Directory\ClassName -# arguments: ["@another_service_name", "plain_value", "%parameter_name%"] + # used for tests + filesystem_cache: + class: Doctrine\Common\Cache\FilesystemCache + arguments: + - %kernel.cache_dir%/doctrine/metadata