diff options
author | Aleksander Machniak <alec@alec.pl> | 2012-09-27 08:27:02 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2012-09-27 08:27:02 +0200 |
commit | 700dc66c679f0ae6e16c9d016a15bee4269371e6 (patch) | |
tree | 21f30c64e3f2559d015777ec7798855d32be24b5 /tests | |
parent | 18df6f38adb9fb067af104e4cf9484904bf49365 (diff) | |
parent | dc8f292b215719506c2ab0abd8429f4c5ec5c0ed (diff) |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Framework/Html.php | 5 | ||||
-rw-r--r-- | tests/phpunit.xml | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/tests/Framework/Html.php b/tests/Framework/Html.php index 8a27baca8..60284deef 100644 --- a/tests/Framework/Html.php +++ b/tests/Framework/Html.php @@ -31,7 +31,6 @@ class Framework_Html extends PHPUnit_Framework_TestCase array('>', '>'), array('&', '&'), array('&', '&amp;'), - array('&', '&', true), ); } @@ -39,8 +38,8 @@ class Framework_Html extends PHPUnit_Framework_TestCase * Test for quote() * @dataProvider data_quote */ - function test_quote($str, $result, $validate = false) + function test_quote($str, $result) { - $this->assertEquals(html::quote($str, $validate), $result); + $this->assertEquals(html::quote($str), $result); } } diff --git a/tests/phpunit.xml b/tests/phpunit.xml index 8b3883223..43c3b767d 100644 --- a/tests/phpunit.xml +++ b/tests/phpunit.xml @@ -29,7 +29,7 @@ <file>HtmlToText.php</file> <file>MailFunc.php</file> </testsuite> - <testsuite name="managesieve"> + <testsuite name="Managesieve Tests"> <file>./../plugins/managesieve/tests/Parser.php</file> <file>./../plugins/managesieve/tests/Tokenizer.php</file> </testsuite> |