diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-11-25 19:37:59 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-11-25 19:37:59 +0100 |
| commit | c4e29bde2331f5ade6883015b8ad90e70bdbd4d3 (patch) | |
| tree | 8dbbf4e2bf595e5d5f3fa3e35f6f12d95e192b9c | |
| parent | 79443eb1d4cf31c754e0a0fc041bc583ae0005ad (diff) | |
| parent | ba1603a5f0e06d30a930170bec0773a3fbe68fc2 (diff) | |
| download | forums-c4e29bde2331f5ade6883015b8ad90e70bdbd4d3.tar forums-c4e29bde2331f5ade6883015b8ad90e70bdbd4d3.tar.gz forums-c4e29bde2331f5ade6883015b8ad90e70bdbd4d3.tar.bz2 forums-c4e29bde2331f5ade6883015b8ad90e70bdbd4d3.tar.xz forums-c4e29bde2331f5ade6883015b8ad90e70bdbd4d3.zip | |
Merge remote-tracking branch 'p/ticket/10481' into develop
* p/ticket/10481:
[ticket/10481] Use phar:// url for requiring goutte.
[ticket/10481] Skip functional tests if phar extension is missing.
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 18bf2a84a8..a1c642bf38 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -7,7 +7,6 @@ * */ -require_once __DIR__ . '/../../vendor/goutte.phar'; require_once __DIR__ . '/../../phpBB/includes/functions_install.php'; class phpbb_functional_test_case extends phpbb_test_case @@ -18,6 +17,16 @@ class phpbb_functional_test_case extends phpbb_test_case static protected $config = array(); static protected $already_installed = false; + static public function setUpBeforeClass() + { + if (!extension_loaded('phar')) + { + self::markTestSkipped('phar extension is not loaded'); + } + + require_once 'phar://' . __DIR__ . '/../../vendor/goutte.phar'; + } + public function setUp() { if (!isset(self::$config['phpbb_functional_url'])) |