address: use comment as name if no phrase available

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

diff --git a/t/cgi.t b/t/cgi.t
index d3172bf74cbd1820e2ae2104ac95c712fd3ae328..62cea49967d7fe0f9866eac0b15a803e929e614e 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,4 +1,4 @@
-# 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>
 # FIXME: this test is too slow and most non-CGI-requirements
 # should be moved over to things which use test_psgi
@@ -6,12 +6,8 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-use File::Temp qw/tempdir/;
-eval { require IPC::Run };
-plan skip_all => "missing IPC::Run for t/cgi.t" if $@;
-
-use constant CGI => "blib/script/public-inbox.cgi";
-my $tmpdir = tempdir('pi-cgi-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+require './t/common.perl';
+my ($tmpdir, $for_destroy) = tmpdir();
 my $home = "$tmpdir/pi-home";
 my $pi_home = "$home/.public-inbox";
 my $pi_config = "$pi_home/config";
@@ -29,7 +25,7 @@ my $cfgpfx = "publicinbox.test";
        close $fh or die "close: $!\n";
        my %cfg = (
                "$cfgpfx.address" => $addr,
-               "$cfgpfx.mainrepo" => $maindir,
+               "$cfgpfx.inboxdir" => $maindir,
                "$cfgpfx.indexlevel" => 'basic',
        );
        while (my ($k,$v) = each %cfg) {
@@ -41,11 +37,11 @@ my $cfgpfx = "publicinbox.test";
 use_ok 'PublicInbox::Git';
 use_ok 'PublicInbox::Import';
 use_ok 'PublicInbox::Inbox';
-use_ok 'PublicInbox::V1Writable';
+use_ok 'PublicInbox::InboxWritable';
 use_ok 'PublicInbox::Config';
 my $cfg = PublicInbox::Config->new($pi_config);
 my $ibx = $cfg->lookup_name('test');
-my $im = PublicInbox::V1Writable->new($ibx);
+my $im = PublicInbox::InboxWritable->new($ibx)->importer;
 
 {
        local $ENV{HOME} = $home;
@@ -145,11 +141,6 @@ EOF
 
 done_testing();
 
-sub run_with_env {
-       my ($env, @args) = @_;
-       IPC::Run::run(@args, init => sub { %ENV = (%ENV, %$env) });
-}
-
 sub cgi_run {
        my %env = (
                PATH_INFO => $_[0],
@@ -162,7 +153,9 @@ sub cgi_run {
                HTTP_HOST => 'test.example.com',
        );
        my ($in, $out, $err) = ("", "", "");
-       my $rc = run_with_env(\%env, [CGI], \$in, \$out, \$err);
+       my $rdr = { 0 => \$in, 1 => \$out, 2 => \$err };
+       run_script(['.cgi'], \%env, $rdr);
+       die "unexpected error: \$?=$?" if $?;
        my ($head, $body) = split(/\r\n\r\n/, $out, 2);
-       { head => $head, body => $body, rc => $rc, err => $err }
+       { head => $head, body => $body, err => $err }
 }