[Rt-commit] rt branch, html-templates, updated. rt-3.9.6-50-ga4b812c

[Thomas Sibley]

The branch, html-templates has been updated
       via  a4b812c5d684ebf00e140e45d9f18a9ac2cfa5af (commit)
      from  73860678d54659c45837125fb7d59ec41b7c6363 (commit)

Summary of changes:
 lib/RT/Interface/Email.pm    |    8 +++-----
 sbin/rt-test-dependencies.in |    2 +-
 t/mail/html-outgoing.t       |    8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

- Log -----------------------------------------------------------------
commit a4b812c5d684ebf00e140e45d9f18a9ac2cfa5af
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Fri Dec 10 15:12:48 2010 -0500

    Use a newer HTML::FormatText::WithLinks that gives us emphasis markers

diff --git a/lib/RT/Interface/Email.pm b/lib/RT/Interface/Email.pm
index 79ea67c..08c88e0 100755
--- a/lib/RT/Interface/Email.pm
+++ b/lib/RT/Interface/Email.pm
@@ -1859,11 +1859,9 @@ sub ConvertHTMLToText {
             after_link      => ' (%l)',
             footnote        => '',
             skip_linked_urls => 1,
-            # XXX TODO: These should be enabled once the patch (rt.cpan.org
-            # #63571) to HTML::FormatText::WithLinks is accepted and released
-            #with_emphasis   => 1,
-            #bold_marker     => '"',
-            #italic_marker   => '"',
+            with_emphasis   => 1,
+            bold_marker     => '"',
+            italic_marker   => '"',
         }
     );
 }
diff --git a/sbin/rt-test-dependencies.in b/sbin/rt-test-dependencies.in
index 8768a69..04290d5 100755
--- a/sbin/rt-test-dependencies.in
+++ b/sbin/rt-test-dependencies.in
@@ -210,7 +210,7 @@ List::MoreUtils
 Net::CIDR
 Regexp::Common::net::CIDR
 Regexp::IPv6
-HTML::FormatText::WithLinks 0.12
+HTML::FormatText::WithLinks 0.14
 HTML::FormatText::WithLinks::AndTables
 .
 
diff --git a/t/mail/html-outgoing.t b/t/mail/html-outgoing.t
index d20dd63..d97c9bc 100644
--- a/t/mail/html-outgoing.t
+++ b/t/mail/html-outgoing.t
@@ -43,7 +43,7 @@ mail_ok {
     to      => 'enduser at example.com',
     subject => qr/\Q[example.com #1] AutoReply: The internet is broken\E/,
     body    => parts_regex(
-        'trouble ticket regarding The internet is broken',
+        'trouble ticket regarding "The internet is broken"',
         'trouble ticket regarding <b>The internet is broken</b>'
     ),
     'Content-Type' => qr{multipart},
@@ -70,7 +70,7 @@ mail_ok {
     subject => qr/\Q[example.com #1] The internet is broken\E/,
     body    => parts_regex(
         'Ticket URL: http://localhost:\d+/Ticket/Display\.html\?id=1.+?'.
-        'This is a test of HTML correspondence\.',
+        'This is a test of "HTML" correspondence\.',
         'Ticket URL: <a href="(http://localhost:\d+/Ticket/Display\.html\?id=1)">\1</a>.+?'.
         '<p>This is a test of <b>HTML</b> correspondence\.</p>'
     ),
@@ -79,7 +79,7 @@ mail_ok {
     to      => 'enduser at example.com',
     subject => qr/\Q[example.com #1] The internet is broken\E/,
     body    => parts_regex(
-        'This is a test of HTML correspondence\.',
+        'This is a test of "HTML" correspondence\.',
         '<p>This is a test of <b>HTML</b> correspondence\.</p>'
     ),
     'Content-Type' => qr{multipart},
@@ -100,7 +100,7 @@ mail_ok {
     body    => parts_regex(
         'This is a comment about ticket 1 \(http://localhost:\d+/Ticket/Display\.html\?id=1\)\..+?'.
         'It is not sent to the Requestor\(s\):.+?'.
-        'Comment test, please!',
+        'Comment test, "please!"',
 
         '<p>This is a comment about <a href="http://localhost:\d+/Ticket/Display\.html\?id=1">ticket 1</a>\. '.
         'It is not sent to the Requestor\(s\):</p>.+?'.

-----------------------------------------------------------------------