makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13325] Make installing composer dependencies in tests folder optional.

Browse source 
Make phpbb_ui_test_case available unconditionally. Nothing depends on 5.3.19
here. Remove __init__ include. Composer classmap autoloading ensures classes
can be loaded.

PHPBB3-13325
This commit is contained in:
Andreas Fischer 2014-11-12 20:34:36 +01:00
parent 8df63a4499
commit 1e4ff6105a
2 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/bootstrap.php
View file

@ -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_case.php';
require_once 'test_framework/phpbb_database_test_connection_manager.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_functional_test_case.php';
if (version_compare(PHP_VERSION,'5.3.19', ">="))
{
require_once 'test_framework/phpbb_ui_test_case.php'; require_once 'test_framework/phpbb_ui_test_case.php';
if (version_compare(PHP_VERSION, '5.3.19', ">=") && file_exists(__DIR__ . '/vendor/autoload.php'))
{
require_once __DIR__ . '/vendor/autoload.php';
} }

14
tests/test_framework/phpbb_ui_test_case.php
View file

@ -10,7 +10,7 @@
* the docs/CREDITS.txt file. * the docs/CREDITS.txt file.
* *
*/ */
require_once __DIR__ . '/../vendor/facebook/webdriver/lib/__init__.php';
require_once __DIR__ . '/../../phpBB/includes/functions_install.php'; require_once __DIR__ . '/../../phpBB/includes/functions_install.php';
class phpbb_ui_test_case extends phpbb_test_case class phpbb_ui_test_case extends phpbb_test_case
@ -31,6 +31,18 @@ class phpbb_ui_test_case extends phpbb_test_case
{ {
parent::setUpBeforeClass(); parent::setUpBeforeClass();
if (version_compare(PHP_VERSION, '5.3.19', '<'))
{
self::markTestSkipped('UI test case requires at least PHP 5.3.19.');
}
else if (!class_exists('\RemoteWebDriver'))
{
self::markTestSkipped(
'Could not find RemoteWebDriver class. ' .
'Run "php ../composer.phar install" from the tests folder.'
);
}
self::$config = phpbb_test_case_helpers::get_test_config(); self::$config = phpbb_test_case_helpers::get_test_config();
self::$root_url = self::$config['phpbb_functional_url']; self::$root_url = self::$config['phpbb_functional_url'];