diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-13 17:11:48 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-13 17:11:48 +0100 |
| commit | c9db08873f1e1d9f9f89da181d5aa374464fc250 (patch) | |
| tree | 8de6393e74b136b2af6bf68ac64171b9f376a210 /tests/bootstrap.php | |
| parent | 9f9ce10f2f50ed8b4255c3682bcaf5ef7b893617 (diff) | |
| parent | 1e4ff6105a3fc34440f5b1294e574d7f8ca7c906 (diff) | |
| download | forums-c9db08873f1e1d9f9f89da181d5aa374464fc250.tar forums-c9db08873f1e1d9f9f89da181d5aa374464fc250.tar.gz forums-c9db08873f1e1d9f9f89da181d5aa374464fc250.tar.bz2 forums-c9db08873f1e1d9f9f89da181d5aa374464fc250.tar.xz forums-c9db08873f1e1d9f9f89da181d5aa374464fc250.zip | |
Merge pull request #3141 from bantu/ticket/13325
[ticket/13325] Make installing composer dependencies in tests folder optional.
Diffstat (limited to 'tests/bootstrap.php')
| -rw-r--r-- | tests/bootstrap.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 65447eb95c..0e81f4372a 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -33,8 +33,9 @@ require_once 'test_framework/phpbb_test_case.php'; require_once 'test_framework/phpbb_database_test_case.php'; require_once 'test_framework/phpbb_database_test_connection_manager.php'; require_once 'test_framework/phpbb_functional_test_case.php'; +require_once 'test_framework/phpbb_ui_test_case.php'; -if (version_compare(PHP_VERSION,'5.3.19', ">=")) +if (version_compare(PHP_VERSION, '5.3.19', ">=") && file_exists(__DIR__ . '/vendor/autoload.php')) { - require_once 'test_framework/phpbb_ui_test_case.php'; + require_once __DIR__ . '/vendor/autoload.php'; } |