X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_mount.t;h=b4de827406b70a62c279454e73e882e617d9ec32;hb=0283273a14e1871955f6a9132f4f3f7884ec8a3f;hp=7160896bb6c2f5071f6e7572ba5e643e89a73938;hpb=1317fb7b4ace03f6d9dfb1a42ee5f9371a1bf913;p=public-inbox.git

diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index 7160896b..b4de8274 100644
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -1,35 +1,31 @@
-# 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-path-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::Eml;
+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::Test URI::Escape
+	Plack::Builder Plack::App::URLMap);
+require_mods(@mods);
 use_ok $_ foreach @mods;
+use_ok 'PublicInbox::WWW';
 use PublicInbox::Import;
 use PublicInbox::Git;
 use PublicInbox::Config;
-use PublicInbox::WWW;
-use Plack::Builder;
-use Plack::App::URLMap;
 my $config = PublicInbox::Config->new(\<<EOF);
 $cfgpfx.address=$addr
-$cfgpfx.mainrepo=$maindir
+$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;
 {
-	my $mime = Email::MIME->new(<<EOF);
+	my $mime = PublicInbox::Eml->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -44,11 +40,11 @@ EOF
 }
 
 my $www = PublicInbox::WWW->new($config);
-my $app = builder {
-	enable 'Head';
-	mount '/a' => builder { sub { $www->call(@_) } };
-	mount '/b' => builder { sub { $www->call(@_) } };
-};
+my $app = builder(sub {
+	enable('Head');
+	mount('/a' => builder(sub { sub { $www->call(@_) } }));
+	mount('/b' => builder(sub { sub { $www->call(@_) } }));
+});
 
 test_psgi($app, sub {
 	my ($cb) = @_;
@@ -88,11 +84,9 @@ test_psgi($app, sub {
 });
 
 SKIP: {
-	my @mods = qw(DBI DBD::SQLite Search::Xapian IO::Uncompress::Gunzip);
-	foreach my $mod (@mods) {
-		eval "require $mod" or skip "$mod not available: $@", 2;
-	}
+	require_mods(qw(DBD::SQLite Search::Xapian IO::Uncompress::Gunzip), 3);
 	my $ibx = $config->lookup_name('test');
+	require_ok 'PublicInbox::SearchIdx';
 	PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
 	test_psgi($app, sub {
 		my ($cb) = @_;