testcommon: introduce mime_load sub

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

diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 0c3174bc241c7c257567ea0905307c876316ae50..0dde9323dc3943a265284be192abf63022caa48b 100644 (file)
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -9,31 +9,28 @@ my ($tmpdir, $for_destroy) = tmpdir();
 my $maindir = "$tmpdir/main.git";
 my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
-my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape);
+my @mods = qw(HTTP::Request::Common Plack::Builder Plack::Test URI::Escape);
 require_mods(@mods);
 use_ok $_ foreach @mods;
+use_ok 'PublicInbox::WWW';
 use PublicInbox::Import;
 use PublicInbox::Git;
 use PublicInbox::Config;
-use PublicInbox::WWW;
 use_ok 'PublicInbox::WwwAttach';
-use Plack::Builder;
 my $config = PublicInbox::Config->new(\<<EOF);
 $cfgpfx.address=$addr
 $cfgpfx.inboxdir=$maindir
 EOF
-is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
 my $git = PublicInbox::Git->new($maindir);
 my $im = PublicInbox::Import->new($git, 'test', $addr);
+$im->init_bare;
 
 {
-       open my $fh, '<', '/dev/urandom' or die "unable to open urandom: $!\n";
-       sysread($fh, my $buf, 8);
-       is(8, length($buf), 'read some random data');
        my $qp = "abcdef=g\n==blah\n";
-       my $b64 = 'b64'.$buf."\n";
+       my $b64 = "b64\xde\xad\xbe\xef\n";
        my $txt = "plain\ntext\npass\nthrough\n";
        my $dot = "dotfile\n";
+       my $mime = mime_load 't/psgi_attach.eml', sub {
        my $parts = [
                Email::MIME->create(
                        attributes => {
@@ -62,14 +59,11 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
                        },
                        body => $dot),
        ];
-       my $mime = Email::MIME->create(
+       Email::MIME->create(
                parts => $parts,
                header_str => [ From => 'root@z', 'Message-Id' => '<Z@B>',
                        Subject => 'hi']
-       );
-       $mime = $mime->as_string;
-       $mime =~ s/\r\n/\n/g; # normalize to LF only
-       $mime = Email::MIME->new($mime);
+       )}; # mime_load sub
        $im->add($mime);
        $im->done;
 
@@ -108,7 +102,6 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
                ok(length($dot_res) >= length($dot), 'dot almost matches');
                $res = $cb->(GET('/test/Z%40B/4-any-filename.txt'));
                is($res->content, $dot_res, 'user-specified filename is OK');
-
        });
 }
 done_testing();