remove most internal Email::MIME usage

[public-inbox.git] / t / plack.t

diff --git a/t/plack.t b/t/plack.t
index b16bc8de9cd2bbae4d5c73cbcd9d77c98c694fbe..37a6b39486e06ea1e4fc575893c3de96e09bc7f1 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -3,7 +3,6 @@
 use strict;
 use warnings;
 use Test::More;
-use Email::MIME;
 use PublicInbox::TestCommon;
 my $psgi = "./examples/public-inbox.psgi";
 my ($tmpdir, $for_destroy) = tmpdir();
@@ -32,7 +31,7 @@ my $git = PublicInbox::Git->new($inboxdir);
 my $im = PublicInbox::Import->new($git, 'test', $addr);
 # ensure successful message delivery
 {
-       my $mime = PublicInbox::MIME->new(<<EOF);
+       my $mime = PublicInbox::Eml->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -51,61 +50,15 @@ EOF
        chomp @ls;
 
        # multipart with two text bodies
-       my %attr_text = (attributes => { content_type => 'text/plain' });
-       my $parts = [
-               Email::MIME->create(%attr_text, body => 'hi'),
-               Email::MIME->create(%attr_text, body => 'bye')
-       ];
-       $mime = Email::MIME->create(
-               header_str => [
-                       From => 'a@example.com',
-                       Subject => 'blargh',
-                       'Message-ID' => '<multipart@example.com>',
-                       'In-Reply-To' => '<irp@example.com>'
-               ],
-               parts => $parts,
-       );
+       $mime = eml_load 't/plack-2-txt-bodies.eml';
        $im->add($mime);
 
        # multipart with attached patch + filename
-       $parts = [ Email::MIME->create(%attr_text, body => 'hi, see attached'),
-               Email::MIME->create(
-                       attributes => {
-                                       content_type => 'text/plain',
-                                       filename => "foo&.patch",
-                       },
-                       body => "--- a/file\n+++ b/file\n" .
-                               "@@ -49, 7 +49,34 @@\n"
-                       )
-       ];
-       $mime = Email::MIME->create(
-               header_str => [
-                       From => 'a@example.com',
-                       Subject => '[PATCH] asdf',
-                       'Message-ID' => '<patch@example.com>'
-               ],
-               parts => $parts
-       );
+       $mime = eml_load 't/plack-attached-patch.eml';
        $im->add($mime);
 
        # multipart collapsed to single quoted-printable text/plain
-       $parts = [
-               Email::MIME->create(
-                       attributes => {
-                               content_type => 'text/plain',
-                               encoding => 'quoted-printable'
-                       },
-                       body => 'hi = bye',
-               )
-       ];
-       $mime = Email::MIME->create(
-               header_str => [
-                       From => 'qp@example.com',
-                       Subject => 'QP',
-                       'Message-ID' => '<qp@example.com>',
-                       ],
-               parts => $parts,
-       );
+       $mime = eml_load 't/plack-qp.eml';
        like($mime->body_raw, qr/hi =3D bye=/, 'our test used QP correctly');
        $im->add($mime);
 
@@ -124,7 +77,7 @@ Date: Fri, 02 Oct 1993 00:00:00 +0000
 :(
 EOF
        $crlf =~ s/\n/\r\n/sg;
-       $im->add(PublicInbox::MIME->new($crlf));
+       $im->add(PublicInbox::Eml->new($crlf));
 
        $im->done;
 }