diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-10-14 17:10:21 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-10-14 17:23:31 +0200 |
| commit | a3928bf82d7fd6a1da074716c08c547afc961346 (patch) | |
| tree | 0ad5cd4b50869cf6d8100324cf2cc49751b98bac /tests/test_framework/phpbb_test_case_helpers.php | |
| parent | 0ffe494edd274647ba6694648dba070c63e55d89 (diff) | |
| download | forums-a3928bf82d7fd6a1da074716c08c547afc961346.tar forums-a3928bf82d7fd6a1da074716c08c547afc961346.tar.gz forums-a3928bf82d7fd6a1da074716c08c547afc961346.tar.bz2 forums-a3928bf82d7fd6a1da074716c08c547afc961346.tar.xz forums-a3928bf82d7fd6a1da074716c08c547afc961346.zip | |
[feature/functional-tests] Generate config correctly and install only once
PHPBB3-10414
Diffstat (limited to 'tests/test_framework/phpbb_test_case_helpers.php')
| -rw-r--r-- | tests/test_framework/phpbb_test_case_helpers.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index cbfb2540c2..9177a443ab 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -58,7 +58,6 @@ class phpbb_test_case_helpers 'dbname' => '', 'dbuser' => '', 'dbpasswd' => '', - 'phpbb_functional_url' => 'http://localhost/', ); } @@ -73,8 +72,12 @@ class phpbb_test_case_helpers 'dbname' => $dbname, 'dbuser' => $dbuser, 'dbpasswd' => $dbpasswd, - 'phpbb_functional_url' => isset($phpbb_functional_url) ? $phpbb_functional_url : 'http://localhost/', )); + + if (isset($phpbb_functional_url)) + { + $config['phpbb_functional_url'] = $phpbb_functional_url; + } } if (isset($_SERVER['PHPBB_TEST_DBMS'])) |