diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-05-09 19:42:13 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-05-09 19:42:13 +0200 |
| commit | 3327739290fe9d953a813fe8649605cee617d06b (patch) | |
| tree | 28d4b6da5a7843307df5802a66c98a67b9adb1d8 /tests | |
| parent | dbb4a87b7945a35d9069283eed049a3a42f40bdf (diff) | |
| parent | 3fb536d7b7a51409a87192b2309ccf50ab11564f (diff) | |
| download | forums-3327739290fe9d953a813fe8649605cee617d06b.tar forums-3327739290fe9d953a813fe8649605cee617d06b.tar.gz forums-3327739290fe9d953a813fe8649605cee617d06b.tar.bz2 forums-3327739290fe9d953a813fe8649605cee617d06b.tar.xz forums-3327739290fe9d953a813fe8649605cee617d06b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
[ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
[ticket/11513] Use PHPUnit from composer in .travis.yml.
[ticket/11513] Update (all) composer dependencies.
[ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.
Conflicts:
.travis.yml
phpBB/composer.lock
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/RUNNING_TESTS.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/RUNNING_TESTS.txt b/tests/RUNNING_TESTS.txt index cede81d59d..fdca3aa178 100644 --- a/tests/RUNNING_TESTS.txt +++ b/tests/RUNNING_TESTS.txt @@ -7,9 +7,14 @@ Prerequisites PHPUnit ------- -phpBB unit tests use PHPUnit framework. Version 3.5 or better is required -to run the tests. PHPUnit prefers to be installed via PEAR; refer to -http://www.phpunit.de/ for more information. +phpBB unit tests use the PHPUnit framework (see http://www.phpunit.de for more +information). Version 3.5 or higher is required to run the tests. PHPUnit can +be installed via Composer together with other development dependencies as +follows. + + $ cd phpBB + $ php ../composer.phar install --dev + $ cd .. PHP extensions -------------- @@ -113,7 +118,7 @@ Running Once the prerequisites are installed, run the tests from the project root directory (above phpBB): - $ phpunit + $ phpBB/vendor/bin/phpunit Slow tests -------------- @@ -123,7 +128,7 @@ Thus these tests are in the `slow` group, which is excluded by default. You can enable slow tests by copying the phpunit.xml.all file to phpunit.xml. If you only want the slow tests, run: - $ phpunit --group slow + $ phpBB/vendor/bin/phpunit --group slow More Information ================ |