update copyrights for 2021

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

diff --git a/t/plack.t b/t/plack.t
index d45dbcd2085b2a286625a43299fd7ff359d4f87b..8d8aa10088d1c0b8afafb33f101de38a08410d6f 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -1,9 +1,8 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
-use Email::MIME;
 use PublicInbox::TestCommon;
 my $psgi = "./examples/public-inbox.psgi";
 my ($tmpdir, $for_destroy) = tmpdir();
@@ -22,8 +21,8 @@ ok(-f $psgi, "psgi example file found");
 my $pfx = 'http://example.com/test';
 ok(run_script(['-init', 'test', $inboxdir, "$pfx/", $addr]),
        'initialized repo');
-PublicInbox::Import::run_die([qw(git config -f), $pi_config,
-       'publicinbox.test.newsgroup', 'inbox.test']);
+xsys_e(qw(git config -f), $pi_config,
+       qw(publicinbox.test.newsgroup inbox.test));
 open my $fh, '>', "$inboxdir/description" or die "open: $!\n";
 print $fh "test for public-inbox\n";
 close $fh or die "close: $!\n";
@@ -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
@@ -46,70 +45,20 @@ EOF
        $im->add($mime);
        $im->done;
        my $rev = $git->qx(qw(rev-list HEAD));
-       like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
+       like($rev, qr/\A[a-f0-9]{40,}/, "good revision committed");
        @ls = $git->qx(qw(ls-tree -r --name-only HEAD));
        chomp @ls;
 
        # multipart with two text bodies
-       my %attr_text = (attributes => { content_type => 'text/plain' });
-       $mime = mime_load 't/plack-2-txt-bodies.eml', sub {
-       my $parts = [
-               Email::MIME->create(%attr_text, body => 'hi'),
-               Email::MIME->create(%attr_text, body => 'bye')
-       ];
-       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_load sub
+       $mime = eml_load 't/plack-2-txt-bodies.eml';
        $im->add($mime);
 
        # multipart with attached patch + filename
-       $mime = mime_load 't/plack-attached-patch.eml', sub {
-       my $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"
-                       )
-       ];
-       Email::MIME->create(
-               header_str => [
-                       From => 'a@example.com',
-                       Subject => '[PATCH] asdf',
-                       'Message-ID' => '<patch@example.com>'
-               ],
-               parts => $parts
-       )}; # mime_load sub
+       $mime = eml_load 't/plack-attached-patch.eml';
        $im->add($mime);
 
        # multipart collapsed to single quoted-printable text/plain
-       $mime = mime_load 't/plack-qp.eml', sub {
-       my $parts = [
-               Email::MIME->create(
-                       attributes => {
-                               content_type => 'text/plain',
-                               encoding => 'quoted-printable'
-                       },
-                       body => 'hi = bye',
-               )
-       ];
-       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);
 
@@ -128,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;
 }
@@ -260,6 +209,10 @@ test_psgi($app, sub {
        my $res = $cb->(GET($pfx . '/blah@example.com/raw'));
        is(200, $res->code, 'success response received for /*/raw');
        like($res->content, qr!^From !sm, "mbox returned");
+
+       $res = $cb->(GET($pfx . '/blah@example.com/t.mbox.gz'));
+       is(501, $res->code, '501 when overview missing');
+       like($res->content, qr!\bOverview\b!, 'overview omission noted');
 });
 
 # legacy redirects