t/*.t: reduce dependency on Email::MIME APIs

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

diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index 41695e0de961a27398bb16e00c06cd507ff6a13b..2376bba7bf2f042e099588da5499429cd679193d 100644 (file)
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,33 +1,29 @@
-# 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;
 use Test::More;
 use Email::MIME;
-use File::Temp qw/tempdir/;
-my $tmpdir = tempdir('psgi-attach-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+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);
-foreach my $mod (@mods) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for plack.t" if $@;
-}
+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({
-       "$cfgpfx.address" => $addr,
-       "$cfgpfx.mainrepo" => $maindir,
-});
-is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=$addr
+$cfgpfx.inboxdir=$maindir
+EOF
 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";
@@ -72,7 +68,7 @@ my $im = PublicInbox::Import->new($git, 'test', $addr);
        );
        $mime = $mime->as_string;
        $mime =~ s/\r\n/\n/g; # normalize to LF only
-       $mime = Email::MIME->new($mime);
+       $mime = PublicInbox::MIME->new($mime);
        $im->add($mime);
        $im->done;
 
@@ -111,7 +107,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();