diff options
| author | David King <imkingdavid@gmail.com> | 2012-03-18 14:44:37 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2012-03-19 09:12:34 -0400 |
| commit | 7d1e4bca334dc9fcef3eb6e62cb412226ebc7ca4 (patch) | |
| tree | 462c1a569a02c1ff1d79683e28b145b494f985a5 /tests/test_framework | |
| parent | 4100b312bb0eb7246e9057461b6f8f3c66fdad60 (diff) | |
| download | forums-7d1e4bca334dc9fcef3eb6e62cb412226ebc7ca4.tar forums-7d1e4bca334dc9fcef3eb6e62cb412226ebc7ca4.tar.gz forums-7d1e4bca334dc9fcef3eb6e62cb412226ebc7ca4.tar.bz2 forums-7d1e4bca334dc9fcef3eb6e62cb412226ebc7ca4.tar.xz forums-7d1e4bca334dc9fcef3eb6e62cb412226ebc7ca4.zip | |
[ticket/10586] more work on getting tests to pass
PHPBB3-10586
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 2 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 9797ecfef8..b3376891bc 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -89,7 +89,7 @@ class phpbb_functional_test_case extends phpbb_test_case { global $phpbb_root_path, $phpEx; - return new phpbb_extension_manager($this->get_db(), self::$config['table_prefix'] . 'ext', $phpbb_root_path, ".$phpEx", new phpbb_cache_driver_null); + return new phpbb_extension_manager($this->get_db(), self::$config['table_prefix'] . 'ext', $phpbb_root_path, ".$phpEx", new phpbb_cache_driver_file); } protected function install_board() diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 51b04db263..4aec07a8fb 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -81,7 +81,7 @@ class phpbb_test_case_helpers $config['phpbb_functional_url'] = $phpbb_functional_url; } - if (isset($phpbb_functional_path)) + if (!empty($phpbb_functional_path)) { $config['phpbb_functional_path'] = $phpbb_functional_path; } @@ -106,11 +106,9 @@ class phpbb_test_case_helpers )); } - if (isset($_SERVER['PHPBB_FUNCTIONAL_PATH'])) + if (!empty($_SERVER['PHPBB_FUNCTIONAL_PATH'])) { - $config = array_merge($config, array( - 'phpbb_functional_path' => isset($_SERVER['PHPBB_FUNCTIONAL_PATH']) ? $_SERVER['PHPBB_FUNCTIONAL_PATH'] : '', - )); + $config['phpbb_functional_path'] = $_SERVER['PHPBB_FUNCTIONAL_PATH']; } return $config; |