X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F05template.t;h=9855fb2e2d4cb9cabdd75f25215bcdb5b1465428;hb=cdce082baff88c9b504948d0671bd0f795374ed5;hp=10f48f4d7c0137315333fcae5fac64e0b6caa58d;hpb=ab4326b446bfbae4cbd57b0c6b9b13800fa2a610;p=catagits%2FCatalyst-View-Email.git

diff --git a/t/05template.t b/t/05template.t
index 10f48f4..9855fb2 100644
--- a/t/05template.t
+++ b/t/05template.t
@@ -1,39 +1,35 @@
 use strict;
 use warnings;
-use Test::More;
 
-use Email::Send::Test;
+BEGIN { $ENV{EMAIL_SENDER_TRANSPORT} = 'Test' }
+use Test::More;
+use Test::Requires {
+    'Catalyst::View::TT' => '0.31',
+};
+use Email::Sender::Simple;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
-eval "use Catalyst::View::TT";
-if ( $@ ) {
-    plan skip_all => 'Catalyst::View::TT required for Template tests';
-    exit;
-}
-plan tests => 11;
-
 use_ok('Catalyst::Test', 'TestApp');
 
 my $response;
 my $time = time;
 ok( ( $response = request("/template_email?time=$time"))->is_success,
     'request ok' );
+my @emails = Email::Sender::Simple->default_transport->deliveries;
 like( $response->content, qr/Template Email Ok/, 'controller says ok' );
-my @emails = Email::Send::Test->emails;
-
 cmp_ok(@emails, '==', 1, 'got emails');
-isa_ok( $emails[0], 'Email::MIME', 'email is ok' );
+isa_ok( $emails[0]->{'email'}, 'Email::Abstract', 'email is ok' );
 
-like($emails[0]->content_type, qr#^multipart/alternative#, 'Multipart email');
+like($emails[0]->{'email'}[0]->header("Content-type"), qr#^multipart/alternative#, 'Multipart email');
 
-my @parts = $emails[0]->parts;
+my @parts = $emails[0]->{'email'}[0]->parts;
 cmp_ok(@parts, '==', 2, 'got parts');
 
-is($parts[0]->content_type, 'text/plain; charset="us-ascii"', 'text/plain part ok');
+is($parts[0]->content_type, 'text/plain', 'text/plain part ok');
 like($parts[0]->body, qr/test-email\@example.com on $time/, 'got content back');
 
-is($parts[1]->content_type, 'text/html; charset="us-ascii"', 'text/html ok');
+is($parts[1]->content_type, 'text/html', 'text/html ok');
 like($parts[1]->body, qr{<em>test-email\@example.com</em> on $time}, 'got content back');
 #like($emails[0]->body, qr/$time/, 'Got our email');
-
+done_testing();