From cd22948c317d779109c4dcb125bc7bc6b13f3a87 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sun, 26 Feb 2017 17:12:59 +0100 Subject: [PATCH] ensuring all PHP versions use the same phpunit from composer in travis CI and documented this alternative in the README --- .travis.yml | 2 +- tst/README.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5e0d074..9e674248 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_script: - composer install -n script: - - cd tst && phpunit + - cd tst && ../vendor/phpunit/phpunit/phpunit after_script: - cd .. diff --git a/tst/README.md b/tst/README.md index d03dd345..f614fe5e 100644 --- a/tst/README.md +++ b/tst/README.md @@ -23,6 +23,12 @@ $ cd PrivateBin/tst $ phpunit ``` +Or you can also use the phpunit installed as dependency of eris by composer: +```console +$ cd PrivateBin/tst +$ ../vendor/phpunit/phpunit/phpunit +``` + Running JavaScript unit tests =============================