X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=5760596ca66cda6fcf61f734f41a6c04da6615f4;hb=d62d98b9a7f502da65673f0b83a6d06312c060d9;hp=a25d2eeb26bc7f7078d721233b83636da8c33c8c;hpb=bfcbbb30ef2001d18219079a7379eb9c99d16cdc;p=public-inbox.git
diff --git a/t/cgi.t b/t/cgi.t
index a25d2eeb..5760596c 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2018 all contributors
+# Copyright (C) 2014-2019 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,20 +6,14 @@ use strict;
use warnings;
use Test::More;
use Email::MIME;
-use File::Temp qw/tempdir/;
-use Cwd;
-eval { require IPC::Run };
-plan skip_all => "missing IPC::Run for t/cgi.t" if $@;
-
-use constant CGI => "blib/script/public-inbox.cgi";
-my $index = "blib/script/public-inbox-index";
-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");
@@ -29,21 +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,
- );
- 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($maindir);
-my $im = PublicInbox::Import->new($git, 'test', $addr);
+use_ok 'PublicInbox::Inbox';
+use_ok 'PublicInbox::InboxWritable';
+use_ok 'PublicInbox::Config';
+my $cfg = PublicInbox::Config->new($pi_config);
+my $ibx = $cfg->lookup_name('test');
+my $im = PublicInbox::InboxWritable->new($ibx)->importer;
{
local $ENV{HOME} = $home;
@@ -77,24 +72,9 @@ Me wrote:
what?
EOF
$im->add($reply);
- $im->done;
-}
-
-# obvious failures, first
-{
- local $ENV{HOME} = $home;
- my $res = cgi_run("/", "", "PUT");
- like($res->{head}, qr/Status:\s*405/i, "PUT not allowed");
-
- $res = cgi_run("/");
- like($res->{head}, qr/Status:\s*404/i, "index returns 404");
-}
-# message-id pages
-{
- local $ENV{HOME} = $home;
my $slashy_mid = 'slashy/asdf@example.com';
- my $reply = Email::MIME->new(<new(<
To: Me
Cc: $addr
@@ -104,30 +84,12 @@ Date: Thu, 01 Jan 1970 00:00:01 +0000
slashy
EOF
- $im->add($reply);
+ $im->add($slashy);
$im->done;
my $res = cgi_run("/test/slashy/asdf\@example.com/raw");
like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/,
"slashy mid raw hit");
-
- $res = cgi_run("/test/blahblah\@example.com/raw");
- like($res->{body}, qr/Message-Id: /,
- "mid raw hit");
-
- $res = cgi_run("/test/blahblah\@example.com/");
- like($res->{body}, qr/\A/, "mid html hit");
- like($res->{head}, qr/Status: 200 OK/, "200 response");
-
- $res = cgi_run("/test/blahblah\@example.com/f/");
- like($res->{head}, qr/Status: 301 Moved/, "301 response");
- like($res->{head},
- qr!^Location: http://[^/]+/test/blahblah\@example\.com/\r\n!ms,
- '301 redirect location');
-
- $res = cgi_run("/test/new.html");
- like($res->{body}, qr/slashy%2Fasdf\@example\.com/,
- "slashy URL generated correctly");
}
# retrieve thread as an mbox
@@ -136,7 +98,14 @@ EOF
my $path = "/test/blahblah\@example.com/t.mbox.gz";
my $res = cgi_run($path);
like($res->{head}, qr/^Status: 501 /, "search not-yet-enabled");
- my $indexed = system($index, $maindir) == 0;
+ my $indexed;
+ eval {
+ require DBD::SQLite;
+ require PublicInbox::SearchIdx;
+ my $s = PublicInbox::SearchIdx->new($ibx, 1);
+ $s->index_sync;
+ $indexed = 1;
+ };
if ($indexed) {
$res = cgi_run($path);
like($res->{head}, qr/^Status: 200 /, "search returned mbox");
@@ -149,6 +118,7 @@ EOF
};
} else {
like($res->{head}, qr/^Status: 501 /, "search not available");
+ SKIP: { skip 'DBD::SQLite not available', 2 };
}
my $have_xml_feed = eval { require XML::Feed; 1 } if $indexed;
@@ -161,16 +131,13 @@ EOF
my $p = XML::Feed->parse(\($res->{body}));
is($p->format, "Atom", "parsed atom feed");
is(scalar $p->entries, 3, "parsed three entries");
+ } else {
+ SKIP: { skip 'DBD::SQLite or XML::Feed 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],
@@ -183,7 +150,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 }
}