From da3b40e5034028899021deedd7b703a826a841f2 Mon Sep 17 00:00:00 2001 From: Patrik Votocek Date: Fri, 20 Mar 2015 11:19:27 +0100 Subject: [PATCH] tests: use original Nette\Tester --- .travis.yml | 4 ++-- composer.json | 10 ++-------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index 28bfec9..d21ec90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,8 +35,8 @@ install: script: - vendor/bin/parallel-lint -e php,phpt src tests - vendor/bin/phpcs -sp --standard=vendor/nella/coding-standard/Nella/ruleset.xml src tests - - if [ $TRAVIS_PHP_VERSION = '5.6' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ]; then vendor/bin/tester -s -p php -c tests/php.ini tests --coverage build/clover.xml --coverage-src src; else vendor/bin/tester -s -p php -c tests/php.ini tests; fi + - if [ $TRAVIS_PHP_VERSION = '5.6' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ] && [ $NETTE = 'default']; then vendor/bin/tester -s -p php -c tests/php.ini tests --coverage build/clover.xml --coverage-src src; else vendor/bin/tester -s -p php -c tests/php.ini tests; fi after_script: - export CI_BUILD_NUMBER=$TRAVIS_BUILD_NUMBER - - if [ $TRAVIS_PHP_VERSION = '5.6' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ]; then vendor/bin/coveralls -v; fi + - if [ $TRAVIS_PHP_VERSION = '5.6' ] && [ $TRAVIS_BRANCH = 'master' ] && [ $TRAVIS_PULL_REQUEST = 'false' ] && [ $NETTE = 'default']; then vendor/bin/coveralls -v; fi diff --git a/composer.json b/composer.json index bc54072..a568b97 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ "require-dev": { "jakub-onderka/php-console-highlighter": "~0.3.1", "jakub-onderka/php-parallel-lint": "~0.8.0", - "nette/tester": "~1.3.2.1", + "nette/tester": "dev-master#a313981", "nella/coding-standard": "~2.0.0", "satooshi/php-coveralls": "dev-master#2fbf803" }, @@ -51,11 +51,5 @@ ] }, "minimum-stability": "dev", - "prefer-stable": true, - "repositories": [ - { - "type": "vcs", - "url": "https://github.com/Vrtak-CZ/tester" - } - ] + "prefer-stable": true }