tests: use original Nette\Tester

nella · Mar 20, 2015 · da3b40e · da3b40e
1 parent 3647d58
commit da3b40e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git 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
@@ -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
 }