1 files changed, 21 insertions, 39 deletions

diff --git a/t/psgi_bad_mids.t b/t/psgi_bad_mids.t
index 70393573..ac0eb3c3 100644
--- a/t/psgi_bad_mids.t
+++ b/t/psgi_bad_mids.t
@@ -1,31 +1,15 @@
-# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
+#!perl -w
+# Copyright (C) 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 PublicInbox::Eml;
-use PublicInbox::Config;
+use v5.12;
 use PublicInbox::TestCommon;
+use PublicInbox::Eml;
 my @mods = qw(DBD::SQLite HTTP::Request::Common Plack::Test
-                URI::Escape Plack::Builder PublicInbox::WWW);
+                URI::Escape Plack::Builder);
 require_git 2.6;
 require_mods(@mods);
 use_ok($_) for @mods;
 use_ok 'PublicInbox::WWW';
-use_ok 'PublicInbox::V2Writable';
-my ($inboxdir, $for_destroy) = tmpdir();
-my $cfgpfx = "publicinbox.bad-mids";
-my $ibx = {
-        inboxdir => $inboxdir,
-        name => 'bad-mids',
-        version => 2,
-        -primary_address => 'test@example.com',
-        indexlevel => 'basic',
-};
-$ibx = PublicInbox::Inbox->new($ibx);
-my $im = PublicInbox::V2Writable->new($ibx, 1);
-$im->{parallel} = 0;
-
 my $msgs = <<'';
 F1V5OR6NMF.3M649JTLO9IXD@tux.localdomain/hehe1"'<foo
 F1V5NB0PTU.3U0DCVGAJ750Z@tux.localdomain"'<>/foo
@@ -36,27 +20,27 @@ F1V58X3CMU.2DCCVAKQZGADV@tux.localdomain/../../../../foo
 F1TVKINT3G.2S6I36MXMHYG6@tux.localdomain" onclick="alert(1)"
 
 my @mids = split(/\n/, $msgs);
-my $i = 0;
-foreach my $mid (@mids) {
-        my $data = << "";
+my $ibx = create_inbox 'bad-mids', version => 2, indexlevel => 'basic', sub {
+        my ($im) = @_;
+        my $i = 0;
+        for my $mid (@mids) {
+                $im->add(PublicInbox::Eml->new(<<"")) or BAIL_OUT;
 Subject: test
 Message-ID: <$mid>
 From: a\@example.com
 To: b\@example.com
 Date: Fri, 02 Oct 1993 00:00:0$i +0000
 
+                $i++;
+        }
+};
 
-        my $mime = PublicInbox::Eml->new(\$data);
-        ok($im->add($mime), "added $mid");
-        $i++
-}
-$im->done;
-
-my $cfg = <<EOF;
-$cfgpfx.address=$ibx->{-primary_address}
-$cfgpfx.inboxdir=$inboxdir
-EOF
-my $config = PublicInbox::Config->new(\$cfg);
+my $tmpdir = tmpdir;
+my $config = cfg_new $tmpdir, <<EOM;
+[publicinbox "bad-mids"]
+        address = $ibx->{-primary_address}
+        inboxdir = $ibx->{inboxdir}
+EOM
 my $www = PublicInbox::WWW->new($config);
 test_psgi(sub { $www->call(@_) }, sub {
         my ($cb) = @_;
@@ -67,7 +51,7 @@ test_psgi(sub { $www->call(@_) }, sub {
                 ok(index($raw, $mid) < 0, "escaped $mid");
         }
 
-        my (@xmids) = ($raw =~ m!\bhref="([^"]+)/t\.mbox\.gz"!sg);
+        my (@xmids) = ($raw =~ m!\bhref="([^"]+?)/T/#u"!sg);
         is(scalar(@xmids), scalar(@mids),
                 'got escaped links to all messages');
 
@@ -84,6 +68,4 @@ test_psgi(sub { $www->call(@_) }, sub {
         }
 });
 
-done_testing();
-
-1;
+done_testing;