X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=97bdebd982a191e5cd96ec83620f097af7f721ae;hb=c29b2b7ded47def906cf00e3baad65c102304120;hp=d3172bf74cbd1820e2ae2104ac95c712fd3ae328;hpb=0b1de991a099b5e8b9a9e3e85b5eaaacc9362dbb;p=public-inbox.git
diff --git a/t/cgi.t b/t/cgi.t
index d3172bf7..97bdebd9 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 all contributors
+# Copyright (C) 2014-2020 all contributors
# License: AGPL-3.0+
# FIXME: this test is too slow and most non-CGI-requirements
# should be moved over to things which use test_psgi
@@ -6,18 +6,14 @@ 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);
+use PublicInbox::TestCommon;
+require_mods(qw(Plack::Handler::CGI Plack::Util));
+my ($tmpdir, $for_destroy) = tmpdir();
my $home = "$tmpdir/pi-home";
my $pi_home = "$home/.public-inbox";
my $pi_config = "$pi_home/config";
my $maindir = "$tmpdir/main.git";
my $addr = 'test-public@example.com';
-my $cfgpfx = "publicinbox.test";
{
is(1, mkdir($home, 0755), "setup ~/ for testing");
@@ -27,25 +23,22 @@ my $cfgpfx = "publicinbox.test";
open my $fh, '>', "$maindir/description" or die "open: $!\n";
print $fh "test for public-inbox\n";
close $fh or die "close: $!\n";
- my %cfg = (
- "$cfgpfx.address" => $addr,
- "$cfgpfx.mainrepo" => $maindir,
- "$cfgpfx.indexlevel" => 'basic',
- );
- while (my ($k,$v) = each %cfg) {
- is(0, system(qw(git config --file), $pi_config, $k, $v),
- "setup $k");
- }
+ open $fh, '>>', $pi_config or die;
+ print $fh <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;
@@ -128,28 +121,24 @@ EOF
SKIP: { skip 'DBD::SQLite not available', 2 };
}
- my $have_xml_feed = eval { require XML::Feed; 1 } if $indexed;
- if ($have_xml_feed) {
+ my $have_xml_treepp = eval { require XML::TreePP; 1 } if $indexed;
+ if ($have_xml_treepp) {
$path = "/test/blahblah\@example.com/t.atom";
$res = cgi_run($path);
like($res->{head}, qr/^Status: 200 /, "atom returned 200");
like($res->{head}, qr!^Content-Type: application/atom\+xml!m,
"search returned atom");
- my $p = XML::Feed->parse(\($res->{body}));
- is($p->format, "Atom", "parsed atom feed");
- is(scalar $p->entries, 3, "parsed three entries");
+ my $t = XML::TreePP->new->parse($res->{body});
+ is(scalar @{$t->{feed}->{entry}}, 3, "parsed three entries");
+ like($t->{feed}->{-xmlns}, qr/\bAtom\b/,
+ 'looks like an an Atom feed');
} else {
- SKIP: { skip 'DBD::SQLite or XML::Feed missing', 2 };
+ SKIP: { skip 'DBD::SQLite or XML::TreePP missing', 2 };
}
}
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 +151,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 }
}