From 637d8eabe76907ce4a1e810d8b6bd964acb1b303 Mon Sep 17 00:00:00 2001 From: Igor Wiedler Date: Sun, 21 Aug 2011 19:26:15 +0200 Subject: [feature/functional-tests] Implementing functional test framework with goutte PHPBB3-10414 --- tests/bootstrap.php | 1 + 1 file changed, 1 insertion(+) (limited to 'tests/bootstrap.php') diff --git a/tests/bootstrap.php b/tests/bootstrap.php index b7c3534cde..9a1c8857c0 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -39,3 +39,4 @@ require_once 'test_framework/phpbb_test_case_helpers.php'; 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'; -- cgit v1.2.1 From 9c861a0350ae67f06a38ee6efc890412a32751f4 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 17 Oct 2011 06:52:34 +0200 Subject: [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2 Tests still execute correctly using PHPUnit 3.5 on PHP 5.3 and above. The php version limitation for a directory was added in PHPUnit 3.6. A separate test suite is required because the functional tests are in the whitelisted tests directory. The base test for functional testing is only included in bootstrap in versions 5.3 and above. PHPBB3-10414 --- tests/bootstrap.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/bootstrap.php') diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 9a1c8857c0..855ea1ce1f 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -39,4 +39,8 @@ require_once 'test_framework/phpbb_test_case_helpers.php'; 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'; + +if (version_compare(PHP_VERSION, '5.3.0-dev', '>=')) +{ + require_once 'test_framework/phpbb_functional_test_case.php'; +} -- cgit v1.2.1