From a5434b02df6a473a849ff1bd3182169727ba1858 Mon Sep 17 00:00:00 2001 From: gggeek Date: Sun, 22 Mar 2015 11:17:52 +0000 Subject: [PATCH] 1st attempt at having code-coverage info for tests uploaded to online QA services --- .travis.yml | 17 ++++++++++------- composer.json | 4 +++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ad93c5d..6c822694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,10 @@ install: - composer self-update && composer install before_script: - # Disable xdebug. NB: this should NOT be done for hhvm... - - if [ "$TRAVIS_PHP_VERSION" != "hhvm" -a "$TRAVIS_PHP_VERSION" != "7.0" ]; then phpenv config-rm xdebug.ini; fi + # Disable xdebug for speed. + # NB: this should NOT be done for hhvm and php 7.0. + # Also we use the php 5.6 run to generate code coverage reports, and we need xdebug for that + - if [ "$TRAVIS_PHP_VERSION" != "hhvm" -a "$TRAVIS_PHP_VERSION" != "7.0" -a "$TRAVIS_PHP_VERSION" != "5.6" ]; then phpenv config-rm xdebug.ini; fi # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./tests/ci/travis/setup_php_fpm.sh; ./tests/ci/travis/setup_apache.sh; fi @@ -27,10 +29,9 @@ before_script: - ./tests/ci/travis/setup_privoxy.sh script: - # to have code coverage: --coverage-clover=coverage.clover # Travis currently compiles PHP with an oldish cURL/GnuTLS combination; # to make the tests pass when Apache has a bogus SSL cert whe need the full set of options below - phpunit tests LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php PROXY=localhost:8080 HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1 SSLVERSION=3 + phpunit tests --coverage-clover=coverage.clover LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php PROXY=localhost:8080 HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1 SSLVERSION=3 after_failure: # Save as much info as we can to help developers @@ -39,6 +40,8 @@ after_failure: - php -i after_script: -# # Upload code-coverage to Scrutinizer -# - wget https://scrutinizer-ci.com/ocular.phar -# - php ocular.phar code-coverage:upload --format=php-clover coverage.clover + # Upload code-coverage to Scrutinizer + - if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then wget https://scrutinizer-ci.com/ocular.phar; fi + - if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi + # Upload code-coverage CodeClimate + - if [ "$TRAVIS_PHP_VERSION" = "5.6" ]; then CODECLIMATE_REPO_TOKEN=7fa6ee01e345090e059e5e42f3bfbcc8692feb8340396382dd76390a3019ac13 ./vendor/bin/test-reporter; fi diff --git a/composer.json b/composer.json index 7e1a9af2..bae04ba9 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,9 @@ "ext-xml": "*" }, "require-dev": { - "phpunit/phpunit": ">=4.0.0" + "phpunit/phpunit": ">=4.0.0", + "phpunit/phpunit-selenium": "*", + "codeclimate/php-test-reporter": "dev-master" }, "suggest": { "ext-curl": "Needed for HTTPS and HTTP 1.1 support, NTLM Auth etc...", -- 2.47.0