search: {version} => {ibx_ver}

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

diff --git a/t/psgi_search.t b/t/psgi_search.t
index 4cd0e499c1841035e72877feb22c9a0c75a513d1..5310e5aba9553bbabf252da82c97d3a520c9165e 100644 (file)
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -3,22 +3,18 @@
 use strict;
 use warnings;
 use Test::More;
-use File::Temp qw/tempdir/;
 use Email::MIME;
 use PublicInbox::Config;
 use PublicInbox::Inbox;
 use PublicInbox::InboxWritable;
-use PublicInbox::WWW;
 use bytes (); # only for bytes::length
+use PublicInbox::TestCommon;
 my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
                URI::Escape Plack::Builder);
-foreach my $mod (@mods) {
-       eval "require $mod";
-       plan skip_all => "$mod missing for psgi_search.t" if $@;
-}
-
-use_ok $_ foreach (@mods, qw(PublicInbox::SearchIdx));
-my $tmpdir = tempdir('pi-psgi-search.XXXXXX', TMPDIR => 1, CLEANUP => 1);
+require_mods(@mods);
+use_ok($_) for (qw(HTTP::Request::Common Plack::Test));
+use_ok 'PublicInbox::WWW';
+my ($tmpdir, $for_destroy) = tmpdir();
 
 my $ibx = PublicInbox::Inbox->new({
        inboxdir => $tmpdir,