diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2013-07-12 10:17:32 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2013-07-12 10:17:32 +0200 |
| commit | deb2b8d0804d1d25a3f28266747ce9041495b372 (patch) | |
| tree | eb32b73e965a3c7b6297f1adc2427689f48b7bd8 /tests | |
| parent | f6777712dc8c8ed2316e2926e98bb081e3785e40 (diff) | |
Allow to load config files for different environments (#1487311); keep (non-default) filename in URLs throughout the webmail app
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Selenium/bootstrap.php | 4 | ||||
| -rw-r--r-- | tests/bootstrap.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/Selenium/bootstrap.php b/tests/Selenium/bootstrap.php index 6611e8feb..e8b186a1e 100644 --- a/tests/Selenium/bootstrap.php +++ b/tests/Selenium/bootstrap.php @@ -27,7 +27,7 @@ if (!defined('INSTALL_PATH')) define('INSTALL_PATH', realpath(dirname(__FILE__) define('TESTS_DIR', dirname(__FILE__) . '/'); if (@is_dir(TESTS_DIR . 'config')) { - define('RCMAIL_CONFIG_DIR', TESTS_DIR . 'config'); + define('RCUBE_CONFIG_DIR', TESTS_DIR . 'config'); } require_once(INSTALL_PATH . 'program/include/iniset.php'); @@ -38,7 +38,7 @@ if (set_include_path($include_path) === false) { die("Fatal error: ini_set/set_include_path does not work."); } -$rcmail = rcube::get_instance(); +$rcmail = rcube::get_instance('test'); define('TESTS_URL', $rcmail->config->get('tests_url')); define('TESTS_BROWSER', $rcmail->config->get('tests_browser', 'firefox')); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 40659ebf0..192997d0d 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -27,12 +27,12 @@ if (!defined('INSTALL_PATH')) define('INSTALL_PATH', realpath(dirname(__FILE__) define('TESTS_DIR', dirname(__FILE__) . '/'); if (@is_dir(TESTS_DIR . 'config')) { - define('RCMAIL_CONFIG_DIR', TESTS_DIR . 'config'); + define('RCUBE_CONFIG_DIR', TESTS_DIR . 'config'); } require_once(INSTALL_PATH . 'program/include/iniset.php'); -rcmail::get_instance()->config->set('devel_mode', false); +rcmail::get_instance('test')->config->set('devel_mode', false); // Extend include path so some plugin test won't fail $include_path = ini_get('include_path') . PATH_SEPARATOR . TESTS_DIR . '..'; |