From 4a05e8a7e8a39aee331a1d5bc45fbc1710ac6a15 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 08 Nov 2013 04:57:00 -0500
Subject: [PATCH] Finish advanced prefs feature (#1488829)

---
 tests/bootstrap.php |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index b321125..192997d 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -27,7 +27,15 @@
 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('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 . '..';
+if (set_include_path($include_path) === false) {
+    die("Fatal error: ini_set/set_include_path does not work.");
+}

--
Gitblit v1.9.1