X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=1b4b06cb5eb47bb205ae128c9b53ee3e6e167307;hb=420fddb8b683637cc1fd39727896cac4a459c3b6;hp=092ad8c7ca05a4f38040bd2b35efb71fa2ebca3e;hpb=9d1e5fadd7d18f4c96ab0509d673040e34225a04;p=public-inbox.git diff --git a/t/cgi.t b/t/cgi.t index 092ad8c7..1b4b06cb 100644 --- a/t/cgi.t +++ b/t/cgi.t @@ -1,5 +1,5 @@ -# 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; @@ -7,12 +7,10 @@ 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); my $home = "$tmpdir/pi-home"; my $pi_home = "$home/.public-inbox"; @@ -31,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), @@ -41,16 +40,18 @@ my $cfgpfx = "publicinbox.test"; use_ok 'PublicInbox::Git'; use_ok 'PublicInbox::Import'; -use_ok 'Email::MIME'; -my $git = PublicInbox::Git->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; - # ensure successful message delivery - { - my $mime = Email::MIME->new(<new(< To: You Cc: $addr @@ -60,15 +61,10 @@ Date: Thu, 01 Jan 1970 00:00:00 +0000 zzzzzz EOF - $im->add($mime); - $im->done; - my $rev = `git --git-dir=$maindir rev-list HEAD`; - like($rev, qr/\A[a-f0-9]{40}/, "good revision committed"); - } + $im->add($mime); # deliver a reply, too - { - my $reply = Email::MIME->new(<new(< To: Me Cc: $addr @@ -82,60 +78,10 @@ Me wrote: what? EOF - $im->add($reply); - $im->done; - my $rev = `git --git-dir=$maindir 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 -{ - local $ENV{HOME} = $home; - 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'); -} -use Data::Dumper; -# 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\@example\.com/!, - "link id set"); - like($res->{body}, qr/what\?/, "reply included"); -} + $im->add($reply); -# message-id pages -{ - local $ENV{HOME} = $home; my $slashy_mid = 'slashy/asdf@example.com'; - my $reply = Email::MIME->new(<<EOF); + my $slashy = Email::MIME->new(<<EOF); From: You <you\@example.com> To: Me <me\@example.com> Cc: $addr @@ -145,36 +91,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%2fasdf\@example.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: <blahblah\@example\.com>/, - "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<html>/, "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->{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/blahblah\@example.con/"); - like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss"); - - $res = cgi_run("/test/new.html"); - like($res->{body}, qr/slashy%2Fasdf\@example\.com/, - "slashy URL generated correctly"); } # retrieve thread as an mbox @@ -183,7 +105,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"); @@ -196,6 +125,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; @@ -208,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} } }; - IPC::Run::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 => '*/*',