summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-04-21 20:45:27 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2010-04-21 20:45:27 +0000
commit4caf2f6635018a3b6616f2d60b7a60a6332b4126 (patch)
tree4e6a17a08bd63cd8b002e8eb9dac0886138a7f4e
parent14e3c485dee80ea24b482dc5c95d66b5956836b2 (diff)
Fix unit tests to run with changed rcmail class + use own config for tests
git-svn-id: https://svn.roundcube.net/trunk@3524 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/tests/mailfunc.php1
-rwxr-xr-xroundcubemail/tests/runtests.sh1
2 files changed, 2 insertions, 0 deletions
diff --git a/roundcubemail/tests/mailfunc.php b/roundcubemail/tests/mailfunc.php
index 755cadc5e..5a17d31c9 100644
--- a/roundcubemail/tests/mailfunc.php
+++ b/roundcubemail/tests/mailfunc.php
@@ -16,6 +16,7 @@ class rcube_test_mailfunc extends UnitTestCase
$GLOBALS['RCMAIL'] = $RCMAIL = rcmail::get_instance();
$GLOBALS['OUTPUT'] = $OUTPUT = $RCMAIL->load_gui();
$RCMAIL->action = 'spell';
+ $RCMAIL->imap_init(false);
$IMAP = $RCMAIL->imap;
require_once 'steps/mail/func.inc';
diff --git a/roundcubemail/tests/runtests.sh b/roundcubemail/tests/runtests.sh
index 04a9a3745..aeeea94e1 100755
--- a/roundcubemail/tests/runtests.sh
+++ b/roundcubemail/tests/runtests.sh
@@ -27,6 +27,7 @@ if (!defined('SIMPLETEST')) define('SIMPLETEST', '/www/simpletest/');
if (!defined('INSTALL_PATH')) define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
define('TESTS_DIR', dirname(__FILE__) . '/');
+define('RCMAIL_CONFIG_DIR', TESTS_DIR . 'config');
require_once(SIMPLETEST . 'unit_tester.php');
require_once(SIMPLETEST . 'reporter.php');