Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / rt / lib / RT / Test / Email.pm

diff --git a/rt/lib/RT/Test/Email.pm b/rt/lib/RT/Test/Email.pm
index 3905d82..77431fd 100644 (file)
--- a/rt/lib/RT/Test/Email.pm
+++ b/rt/lib/RT/Test/Email.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -56,8 +56,6 @@ use Email::Abstract;
 use base 'Exporter';
 our @EXPORT = qw(mail_ok);
 
-RT::Test->set_mail_catcher;
-
 =head1 NAME
 
 RT::Test::Email - 
@@ -122,7 +120,8 @@ END {
     if (scalar @mail) {
         diag ((scalar @mail)." uncaught notification email at end of test: ");
         diag "From: @{[ $_->header('From' ) ]}, Subject: @{[ $_->header('Subject') ]}"
-            for @mail;
+            for map { Email::Abstract->new($_)->cast('Email::Simple') } @mail;
+
         die;
     }
 }