testcommon: add require_mods method and use it

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

diff --git a/t/plack.t b/t/plack.t
index 2ff98e983e34527113b51a852e73aafe5c568ca8..f0dc4bbb515777299d437d13ec801f6494fdf94f 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -1,21 +1,18 @@
-# Copyright (C) 2014-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2019 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/;
+use PublicInbox::TestCommon;
 my $psgi = "./examples/public-inbox.psgi";
-my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($tmpdir, $for_destroy) = tmpdir();
 my $pi_config = "$tmpdir/config";
 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 $@;
-}
+require_mods(@mods);
 use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Git';
 my @ls;
@@ -29,7 +26,7 @@ foreach my $mod (@mods) { use_ok $mod; }
        close $fh or die "close: $!\n";
        my %cfg = (
                "$cfgpfx.address" => $addr,
-               "$cfgpfx.mainrepo" => $maindir,
+               "$cfgpfx.inboxdir" => $maindir,
                "$cfgpfx.url" => 'http://example.com/test/',
                "$cfgpfx.newsgroup" => 'inbox.test',
        );
@@ -54,9 +51,9 @@ EOF
                my $im = PublicInbox::Import->new($git, 'test', $addr);
                $im->add($mime);
                $im->done;
-               my $rev = `git --git-dir="$maindir" rev-list HEAD`;
+               my $rev = $git->qx(qw(rev-list HEAD));
                like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
-               @ls = `git --git-dir="$maindir" ls-tree -r --name-only HEAD`;
+               @ls = $git->qx(qw(ls-tree -r --name-only HEAD));
                chomp @ls;
        }
        my $app = eval {