From d10e5ef10d6984746a37578549fec5eeb4427d4c Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Fri, 25 Sep 2009 18:17:24 +0200 Subject: [PATCH] Fix tests. --- .../Text_Filter/lib/Horde/Text/Filter/Emails.php | 2 +- .../Text_Filter/test/Horde/Text/Filter/emails.phpt | 4 ++-- .../test/Horde/Text/Filter/environment.phpt | 4 ++-- .../Text_Filter/test/Horde/Text/Filter/html2text.phpt | 13 ++++++++----- .../test/Horde/Text/Filter/html2text2.phpt | 12 +++++++----- .../test/Horde/Text/Filter/html2text3.phpt | 19 ++++++++++--------- .../test/Horde/Text/Filter/space2html.phpt | 4 ++-- .../Text_Filter/test/Horde/Text/Filter/text2html.phpt | 6 ++++-- 8 files changed, 36 insertions(+), 28 deletions(-) diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Emails.php b/framework/Text_Filter/lib/Horde/Text/Filter/Emails.php index 1996fae71..615a359c7 100644 --- a/framework/Text_Filter/lib/Horde/Text/Filter/Emails.php +++ b/framework/Text_Filter/lib/Horde/Text/Filter/Emails.php @@ -77,7 +77,7 @@ EOR; $registry = Horde_Registry::singleton(); } - if ($registry && + if (isset($registry) && $registry->hasMethod('mail/compose') && !$this->_params['always_mailto']) { /* If we have a mail/compose registry method, use it. */ diff --git a/framework/Text_Filter/test/Horde/Text/Filter/emails.phpt b/framework/Text_Filter/test/Horde/Text/Filter/emails.phpt index 4bdc2ae2a..16abeb68f 100644 --- a/framework/Text_Filter/test/Horde/Text/Filter/emails.phpt +++ b/framework/Text_Filter/test/Horde/Text/Filter/emails.phpt @@ -3,8 +3,8 @@ Horde_Text_Filter_Email tests --FILE-- 'UTF-8')); @@ -133,10 +135,11 @@ Zitat von Jane Doe : > > > > > > They aren't displayed by default, or do you mean you don't want -> > them to appear in the top right calendar panel? +> them +> > to appear in the top right calendar panel? > -> Yes I don't want them to appear in the top right calendar panel -> but I want user can create their external_cal +> Yes I don't want them to appear in the top right calendar panel but +> I want user can create their external_cal Jan. diff --git a/framework/Text_Filter/test/Horde/Text/Filter/html2text2.phpt b/framework/Text_Filter/test/Horde/Text/Filter/html2text2.phpt index 6934715dd..7a437fa50 100644 --- a/framework/Text_Filter/test/Horde/Text/Filter/html2text2.phpt +++ b/framework/Text_Filter/test/Horde/Text/Filter/html2text2.phpt @@ -3,8 +3,10 @@ Horde_Text_Filter_Html2text lists test --FILE-- @@ -19,9 +21,9 @@ echo Horde_Text_Filter::filter($html, 'html2text', array('wrap' => false)); ?> --EXPECT-- * This is a short line. - * This is a long line. This is a long line. -This is a long line. This is a long line. This is -a long line. This is a long line. This is a long + * This is a long line. This is a long line. This +is a long line. This is a long line. This is a +long line. This is a long line. This is a long line. This is a long line. This is a long line. This is a long line. This is a long line. This is a long line. diff --git a/framework/Text_Filter/test/Horde/Text/Filter/html2text3.phpt b/framework/Text_Filter/test/Horde/Text/Filter/html2text3.phpt index f6c818679..89ce33934 100644 --- a/framework/Text_Filter/test/Horde/Text/Filter/html2text3.phpt +++ b/framework/Text_Filter/test/Horde/Text/Filter/html2text3.phpt @@ -3,8 +3,10 @@ Horde_Text_Filter_Html2text quoting test --FILE-- Zitat von Roberto Maurizzi <roberto.maurizzi@gmail.com>:

@@ -36,13 +38,12 @@ echo Horde_Text_Filter::filter($html, 'html2text'); --EXPECT-- Zitat von Roberto Maurizzi : -> > > > 4) In Turba, I can select a VFS driver to use. Currently it -is +> > > > 4) In Turba, I can select a VFS driver to use. Currently it is > > set > > > > to > > > > None and turba seems to be working fine. What does Turba use -> > the -> > > > VFS +> the +> > > VFS > > > > for? > > > > You can attach files to contacts with that. @@ -52,9 +53,9 @@ is > Anything similar for Kronolith, maybe in the new version? > I've googled a little and only found a discussion in 2004 about > having attachment (or links) from VFS in Kronolith. -> I'd really like to be able to attach all my taxes forms to the day -> I have to pay them ;-) and more in general all the extra -> documentation regarding an appointment. +> I'd really like to be able to attach all my taxes forms to the day I +> have to pay them ;-) and more in general all the extra documentation +> regarding an appointment. > > Ciao, > Roberto diff --git a/framework/Text_Filter/test/Horde/Text/Filter/space2html.phpt b/framework/Text_Filter/test/Horde/Text/Filter/space2html.phpt index 27d54a3f9..2682e904c 100644 --- a/framework/Text_Filter/test/Horde/Text/Filter/space2html.phpt +++ b/framework/Text_Filter/test/Horde/Text/Filter/space2html.phpt @@ -3,8 +3,8 @@ Horde_Text_Filter_Space2html tests --FILE--