summaryrefslogtreecommitdiff
path: root/tests/Selenium/bootstrap.php
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-07-12 10:17:32 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-07-12 10:17:32 +0200
commitdeb2b8d0804d1d25a3f28266747ce9041495b372 (patch)
treeeb32b73e965a3c7b6297f1adc2427689f48b7bd8 /tests/Selenium/bootstrap.php
parentf6777712dc8c8ed2316e2926e98bb081e3785e40 (diff)
Allow to load config files for different environments (#1487311); keep (non-default) filename in URLs throughout the webmail app
Diffstat (limited to 'tests/Selenium/bootstrap.php')
-rw-r--r--tests/Selenium/bootstrap.php4
1 files changed, 2 insertions, 2 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'));