X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=1b4b06cb5eb47bb205ae128c9b53ee3e6e167307;hb=4821798351defce82c102e46d6f5f84f0cdc0e34;hp=4ce6514c74204e7f980962aa01ec3bebabf36886;hpb=d39a8a440c9b5c59e1fa058467f64034f8974e0e;p=public-inbox.git
diff --git a/t/cgi.t b/t/cgi.t
index 4ce6514c..1b4b06cb 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,30 +1,25 @@
-# Copyright (C) 2014-2015 all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# 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
use strict;
use warnings;
use Test::More;
use Email::MIME;
use File::Temp qw/tempdir/;
-use Cwd;
-use IPC::Run qw/run/;
+eval { require IPC::Run };
+plan skip_all => "missing IPC::Run for t/cgi.t" if $@;
use constant CGI => "blib/script/public-inbox.cgi";
-my $mda = "blib/script/public-inbox-mda";
-my $index = "blib/script/public-inbox-index";
-my $tmpdir = tempdir(CLEANUP => 1);
+my $tmpdir = tempdir('pi-cgi-XXXXXX', TMPDIR => 1, CLEANUP => 1);
my $home = "$tmpdir/pi-home";
my $pi_home = "$home/.public-inbox";
my $pi_config = "$pi_home/config";
my $maindir = "$tmpdir/main.git";
-my $main_bin = getcwd()."/t/main-bin";
-my $main_path = "$main_bin:$ENV{PATH}"; # for spamc ham mock
my $addr = 'test-public@example.com';
my $cfgpfx = "publicinbox.test";
{
- ok(-x "$main_bin/spamc",
- "spamc ham mock found (run in top of source tree");
- ok(-x $mda, "$mda is executable");
is(1, mkdir($home, 0755), "setup ~/ for testing");
is(1, mkdir($pi_home, 0755), "setup ~/.public-inbox");
is(0, system(qw(git init -q --bare), $maindir), "git init (main)");
@@ -34,7 +29,8 @@ 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) {
is(0, system(qw(git config --file), $pi_config, $k, $v),
@@ -42,15 +38,20 @@ my $cfgpfx = "publicinbox.test";
}
}
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
+use_ok 'PublicInbox::Git';
+use_ok 'PublicInbox::Import';
+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;
- local $ENV{ORIGINAL_RECIPIENT} = $addr;
- # ensure successful message delivery
- {
- my $simple = Email::Simple->new(<new(<
To: You
Cc: $addr
@@ -60,16 +61,10 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000
zzzzzz
EOF
- my $in = $simple->as_string;
- run_with_env({PATH => $main_path}, [$mda], \$in);
- local $ENV{GIT_DIR} = $maindir;
- my $rev = `git rev-list HEAD`;
- like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
- }
+ $im->add($mime);
# deliver a reply, too
- {
- my $reply = Email::Simple->new(<new(<
To: Me
Cc: $addr
@@ -83,75 +78,10 @@ Me wrote:
what?
EOF
- my $in = $reply->as_string;
- run_with_env({PATH => $main_path}, [$mda], \$in);
- local $ENV{GIT_DIR} = $maindir;
- my $rev = `git rev-list HEAD`;
- like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
- }
-
-}
-
-# 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");
-}
-
-# dumb HTTP support
-{
- my $path = "/test/info/refs";
- my $res = cgi_run($path);
- like($res->{head}, qr/Status:\s*200/i, "info/refs readable");
- my $orig = $res->{body};
-
- local $ENV{HTTP_RANGE} = 'bytes=5-10';
- $res = cgi_run($path);
- like($res->{head}, qr/Status:\s*206/i, "info/refs partial OK");
- is($res->{body}, substr($orig, 5, 6), 'partial body OK');
-
- local $ENV{HTTP_RANGE} = 'bytes=5-';
- $res = cgi_run($path);
- like($res->{head}, qr/Status:\s*206/i, "info/refs partial past end OK");
- is($res->{body}, substr($orig, 5), 'partial body OK past end');
-}
-
-# atom feeds
-{
- local $ENV{HOME} = $home;
- my $res = cgi_run("/test/atom.xml");
- like($res->{body}, qr/test for public-inbox/,
- "set title in XML feed");
- like($res->{body},
- qr!http://test\.example\.com/test/blah%40example\.com/!,
- "link id set");
- like($res->{body}, qr/what\?/, "reply included");
-}
-
-# indices
-{
- local $ENV{HOME} = $home;
- my $res = cgi_run("/test/");
- like($res->{head}, qr/Status: 200 OK/, "index returns 200");
-
- my $idx = cgi_run("/test/index.html");
- $idx->{body} =~ s!/index.html(\?r=)!/$1!g; # dirty...
- $idx->{body} = [ split(/\n/, $idx->{body}) ];
- $res->{body} = [ split(/\n/, $res->{body}) ];
- is_deeply($res, $idx,
- '/$LISTNAME/ and /$LISTNAME/index.html are nearly identical');
- # more checks in t/feed.t
-}
+ $im->add($reply);
-# message-id pages
-{
- local $ENV{HOME} = $home;
my $slashy_mid = 'slashy/asdf@example.com';
- my $reply = Email::Simple->new(<new(<
To: Me
Cc: $addr
@@ -161,50 +91,28 @@ Date: Thu, 01 Jan 1970 00:00:01 +0000
slashy
EOF
- my $in = $reply->as_string;
-
- {
- local $ENV{HOME} = $home;
- local $ENV{ORIGINAL_RECIPIENT} = $addr;
- run_with_env({PATH => $main_path}, [$mda], \$in);
- }
- local $ENV{GIT_DIR} = $maindir;
+ $im->add($slashy);
+ $im->done;
- my $res = cgi_run("/test/slashy%2fasdf%40example.com/raw");
+ 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.con/raw");
- like($res->{head}, qr/Status: 300 Multiple Choices/, "mid raw miss");
-
- $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.con/");
- like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
-
- $res = cgi_run("/test/blahblah\@example.com/f/");
- like($res->{body}, qr/\A/, "mid html");
- like($res->{head}, qr/Status: 200 OK/, "200 response");
- $res = cgi_run("/test/blahblah\@example.con/f/");
- like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
-
- $res = cgi_run("/test/");
- like($res->{body}, qr/slashy%2Fasdf%40example\.com/,
- "slashy URL generated correctly");
}
# retrieve thread as an mbox
{
local $ENV{HOME} = $home;
- local $ENV{PATH} = $main_path;
- my $path = "/test/blahblah%40example.com/t.mbox.gz";
+ 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");
@@ -217,11 +125,12 @@ 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;
if ($have_xml_feed) {
- $path = "/test/blahblah%40example.com/t.atom";
+ $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,
@@ -229,29 +138,24 @@ 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 };
}
}
-# redirect list-name-only URLs
-{
- local $ENV{HOME} = $home;
- my $res = cgi_run("/test");
- like($res->{head}, qr/Status: 301 Moved/, "redirected status");
- like($res->{head}, qr!/test/!, "redirected with slash");
-}
-
done_testing();
sub run_with_env {
my ($env, @args) = @_;
- my $init = sub { foreach my $k (keys %$env) { $ENV{$k} = $env->{$k} } };
- run(@args, init => $init);
+ IPC::Run::run(@args, init => sub { %ENV = (%ENV, %$env) });
}
sub cgi_run {
my %env = (
PATH_INFO => $_[0],
QUERY_STRING => $_[1] || "",
+ SCRIPT_NAME => '',
+ REQUEST_URI => $_[0] . ($_[1] ? "?$_[1]" : ''),
REQUEST_METHOD => $_[2] || "GET",
GATEWAY_INTERFACE => 'CGI/1.1',
HTTP_ACCEPT => '*/*',