diff options
| author | Patrick Webster <noxwizard@phpbb.com> | 2012-04-21 04:37:57 -0500 |
|---|---|---|
| committer | Patrick Webster <noxwizard@phpbb.com> | 2012-04-21 04:37:57 -0500 |
| commit | 2aa994b5ad76941689e7993707509e48438c500b (patch) | |
| tree | 0700c12f55a83615ae96249d21717a461900ff69 /tests/test_framework/phpbb_test_case_helpers.php | |
| parent | de70b17b1dc19e19faa0d56395a1aba8868c9624 (diff) | |
| download | forums-2aa994b5ad76941689e7993707509e48438c500b.tar forums-2aa994b5ad76941689e7993707509e48438c500b.tar.gz forums-2aa994b5ad76941689e7993707509e48438c500b.tar.bz2 forums-2aa994b5ad76941689e7993707509e48438c500b.tar.xz forums-2aa994b5ad76941689e7993707509e48438c500b.zip | |
[ticket/10492] Backporting functional tests
PHPBB3-10492
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 9c60969d76..b46c36efaa 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -70,6 +70,11 @@ class phpbb_test_case_helpers 'dbuser' => $dbuser, 'dbpasswd' => $dbpasswd, )); + + if (isset($phpbb_functional_url)) + { + $config['phpbb_functional_url'] = $phpbb_functional_url; + } } if (isset($_SERVER['PHPBB_TEST_DBMS'])) @@ -84,6 +89,13 @@ class phpbb_test_case_helpers )); } + if (isset($_SERVER['PHPBB_FUNCTIONAL_URL'])) + { + $config = array_merge($config, array( + 'phpbb_functional_url' => isset($_SERVER['PHPBB_FUNCTIONAL_URL']) ? $_SERVER['PHPBB_FUNCTIONAL_URL'] : '', + )); + } + return $config; } } |