X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_attach.t;h=297e92e1a4fb2107affc425dedf667cbc7fef9c3;hb=6ebcec3add4d6aeff6e3b3eb019a404528c079ec;hp=ef116c6af13f63fab9368ea91ed13ac2b39da5c0;hpb=d6cdb106f27abed5d05da035c95e106939fbe3b2;p=public-inbox.git
diff --git a/t/psgi_attach.t b/t/psgi_attach.t
index ef116c6a..297e92e1 100644
--- a/t/psgi_attach.t
+++ b/t/psgi_attach.t
@@ -1,30 +1,26 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
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::Request 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,
-});
+my $config = PublicInbox::Config->new(\<new($maindir);
my $im = PublicInbox::Import->new($git, 'test', $addr);
@@ -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();