diff options
| author | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
|---|---|---|
| committer | Cyrill von Wattenwyl <cvw@adfinis.com> | 2014-09-02 11:20:52 +0200 |
| commit | 11a40dd1fef6c5b78b054617caba4325f95ee386 (patch) | |
| tree | de2e1d7efd6423ef4d1256dd5c90a972ad172719 /tests/phpunit.xml | |
| parent | 187fd666aa2f32dedfe544d69b7cb213698197f2 (diff) | |
| parent | ba084313bfc9c7a5a83e0611fe4376543cc1653d (diff) | |
Merge branch 'master' of https://github.com/roundcube/roundcubemail
Conflicts:
plugins/password/config.inc.php.dist
Diffstat (limited to 'tests/phpunit.xml')
| -rw-r--r-- | tests/phpunit.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/phpunit.xml b/tests/phpunit.xml index cee3434c1..5c27d0e0d 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -40,11 +40,13 @@ <file>Framework/SpellcheckPspell.php</file> <file>Framework/Spellchecker.php</file> <file>Framework/StringReplacer.php</file> + <file>Framework/Text2Html.php</file> <file>Framework/User.php</file> <file>Framework/Utils.php</file> <file>Framework/VCard.php</file> <file>Framework/Washtml.php</file> <file>MailFunc.php</file> + <file>RcmailFunc.php</file> </testsuite> <testsuite name="Plugins Tests"> <file>./../plugins/acl/tests/Acl.php</file> @@ -66,6 +68,7 @@ <file>./../plugins/managesieve/tests/Managesieve.php</file> <file>./../plugins/managesieve/tests/Parser.php</file> <file>./../plugins/managesieve/tests/Tokenizer.php</file> + <file>./../plugins/managesieve/tests/Vacation.php</file> <file>./../plugins/markasjunk/tests/Markasjunk.php</file> <file>./../plugins/new_user_dialog/tests/NewUserDialog.php</file> <file>./../plugins/new_user_identity/tests/NewUserIdentity.php</file> |