[Rt-commit] rt branch, 4.0/encode-base64-for-dashboard-html-email, updated. rt-4.0.18-30-gf60d35c

[Alex Vandiver]

The branch, 4.0/encode-base64-for-dashboard-html-email has been updated
       via  f60d35ca534f7c00a5384f538f4bb19148b3fec4 (commit)
       via  d9086dc896adf22bffba95eb6ba5b58d8b1b20fc (commit)
       via  0b62ae8a3bc852372b0f069a5628b680abab6a4c (commit)
      from  d3cce810dda243968921e66418371b4cebb780f4 (commit)

Summary of changes:
 lib/RT/Dashboard/Mailer.pm |  2 ++
 t/mail/dashboards.t        | 22 +++++++++-------------
 2 files changed, 11 insertions(+), 13 deletions(-)

- Log -----------------------------------------------------------------
commit 0b62ae8a3bc852372b0f069a5628b680abab6a4c
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Nov 21 18:48:13 2013 -0500

    Collapse the multipart/mixed if there are no attachments

diff --git a/lib/RT/Dashboard/Mailer.pm b/lib/RT/Dashboard/Mailer.pm
index c76eea4..276c5fb 100644
--- a/lib/RT/Dashboard/Mailer.pm
+++ b/lib/RT/Dashboard/Mailer.pm
@@ -429,6 +429,8 @@ sub BuildEmail {
         $entity->add_part($part);
     }
 
+    $entity->make_singlepart;
+
     return $entity;
 }
 

commit d9086dc896adf22bffba95eb6ba5b58d8b1b20fc
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Nov 21 18:49:41 2013 -0500

    Test that dashboards are base64 encoded

diff --git a/t/mail/dashboards.t b/t/mail/dashboards.t
index edd4553..63e4d5c 100644
--- a/t/mail/dashboards.t
+++ b/t/mail/dashboards.t
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 181;
+use RT::Test tests => undef;
 use Test::Warn;
 use RT::Dashboard::Mailer;
 
@@ -102,6 +102,7 @@ sub produces_dashboard_mail_ok { # {{{
     my $mail = parse_mail( $mails[0] );
     is($mail->head->get('Subject'), $subject);
     is($mail->head->get('From'), "root\n");
+    is($mail->head->get('Content-Transfer-Encoding'), "base64\n");
     is($mail->head->get('X-RT-Dashboard-Id'), "$dashboard_id\n");
     is($mail->head->get('X-RT-Dashboard-Subscription-Id'), "$subscription_id\n");
 
@@ -368,3 +369,4 @@ produces_no_dashboard_mail_ok(
     Time    => $bad_time,
 );
 
+done_testing;

commit f60d35ca534f7c00a5384f538f4bb19148b3fec4
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu Nov 21 18:50:04 2013 -0500

    If decoded bodyhandles are fetched, these skipped tests pass just fine

diff --git a/t/mail/dashboards.t b/t/mail/dashboards.t
index 63e4d5c..6bf4ba5 100644
--- a/t/mail/dashboards.t
+++ b/t/mail/dashboards.t
@@ -106,12 +106,9 @@ sub produces_dashboard_mail_ok { # {{{
     is($mail->head->get('X-RT-Dashboard-Id'), "$dashboard_id\n");
     is($mail->head->get('X-RT-Dashboard-Subscription-Id'), "$subscription_id\n");
 
-    SKIP: {
-        skip 'Weird MIME failure', 2;
-        my $body = $mail->stringify_body;
-        like($body, qr{My dashboards});
-        like($body, qr{<a href="http://[^/]+/Dashboards/\d+/Testing!">Testing!</a>});
-    };
+    my $body = $mail->bodyhandle->as_string;
+    like($body, qr{My dashboards});
+    like($body, qr{<a href="http://[^/]+/Dashboards/\d+/Testing!">Testing!</a>});
 } # }}}
 
 sub produces_no_dashboard_mail_ok { # {{{
@@ -203,12 +200,9 @@ is($mail->head->get('From'), "dashboard\@example.com\n");
 is($mail->head->get('X-RT-Dashboard-Id'), "$dashboard_id\n");
 is($mail->head->get('X-RT-Dashboard-Subscription-Id'), "$subscription_id\n");
 
-SKIP: {
-    skip 'Weird MIME failure', 2;
-    my $body = $mail->stringify_body;
-    unlike($body, qr{My dashboards});
-    unlike($body, qr{Testing!});
-};
+my $body = $mail->bodyhandle->as_string;
+unlike($body, qr{My dashboards});
+unlike($body, qr{Testing!});
 
 delete_dashboard($dashboard_id);
 

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