X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=18632cee6c366ee0d6e00c801cb497d1783828bf;hb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;hp=611fb60423060ef46b4aa8c16ebdcb7646cb3bd5;hpb=3f9410e7a2663dc3f341f82687bef3e9dbea336a;p=public-inbox.git diff --git a/t/cgi.t b/t/cgi.t index 611fb604..18632cee 100644 --- a/t/cgi.t +++ b/t/cgi.t @@ -1,4 +1,4 @@ -# Copyright (C) 2014, Eric Wong and all contributors +# Copyright (C) 2014-2015 all contributors # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) use strict; use warnings; @@ -10,6 +10,7 @@ use IPC::Run qw/run/; 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 $home = "$tmpdir/pi-home"; my $pi_home = "$home/.public-inbox"; @@ -28,10 +29,12 @@ my $cfgpfx = "publicinbox.test"; is(1, mkdir($pi_home, 0755), "setup ~/.public-inbox"); is(0, system(qw(git init -q --bare), $maindir), "git init (main)"); + 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.description" => 'test for public-inbox', ); while (my ($k,$v) = each %cfg) { is(0, system(qw(git config --file), $pi_config, $k, $v), @@ -40,10 +43,10 @@ my $cfgpfx = "publicinbox.test"; } my $failbox = "$home/fail.mbox"; -local $ENV{PI_FAILBOX} = $failbox; +local $ENV{PI_EMERGENCY} = $failbox; { local $ENV{HOME} = $home; - local $ENV{RECIPIENT} = $addr; + local $ENV{ORIGINAL_RECIPIENT} = $addr; # ensure successful message delivery { @@ -102,16 +105,13 @@ EOF # atom feeds { local $ENV{HOME} = $home; - my $res = cgi_run("/test/all.atom.xml"); + 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/m/blah%40example\.com!, + qr!http://test\.example\.com/test/blah%40example\.com/!, "link id set"); like($res->{body}, qr/what\?/, "reply included"); - - $res = cgi_run("/test/index.atom.xml"); - unlike($res->{body}, qr/what\?/, "reply not included in index"); } # indices @@ -121,8 +121,11 @@ EOF 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 identical'); + '/$LISTNAME/ and /$LISTNAME/index.html are nearly identical'); # more checks in t/feed.t } @@ -144,38 +147,73 @@ EOF { local $ENV{HOME} = $home; - local $ENV{RECIPIENT} = $addr; + local $ENV{ORIGINAL_RECIPIENT} = $addr; run_with_env({PATH => $main_path}, [$mda], \$in); } local $ENV{GIT_DIR} = $maindir; - my $res = cgi_run("/test/m/slashy%2fasdf%40example.com.txt"); + my $res = cgi_run("/test/slashy%2fasdf%40example.com/raw"); like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/, - "slashy mid.txt hit"); + "slashy mid raw hit"); - $res = cgi_run("/test/m/blahblah\@example.com.txt"); + $res = cgi_run("/test/blahblah\@example.com/raw"); like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/, - "mid.txt hit"); - $res = cgi_run("/test/m/blahblah\@example.con.txt"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.txt miss"); + "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/m/blahblah\@example.com.html"); - like($res->{body}, qr/\A<html>/, "mid.html hit"); + $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/m/blahblah\@example.con.html"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.html miss"); + $res = cgi_run("/test/blahblah\@example.con/"); + like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss"); - $res = cgi_run("/test/f/blahblah\@example.com.html"); - like($res->{body}, qr/\A<html>/, "mid.html hit"); + $res = cgi_run("/test/blahblah\@example.com/f/"); + like($res->{body}, qr/\A<html>/, "mid html"); like($res->{head}, qr/Status: 200 OK/, "200 response"); - $res = cgi_run("/test/f/blahblah\@example.con.html"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.html miss"); + $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 $res = cgi_run($path); + like($res->{head}, qr/^Status: 501 /, "search not-yet-enabled"); + my $indexed = system($index, $maindir) == 0; + if ($indexed) { + $res = cgi_run($path); + like($res->{head}, qr/^Status: 200 /, "search returned mbox"); + eval { + require IO::Uncompress::Gunzip; + my $in = $res->{body}; + my $out; + IO::Uncompress::Gunzip::gunzip(\$in => \$out); + like($out, qr/^From /m, "From lines in mbox"); + }; + } else { + like($res->{head}, qr/^Status: 501 /, "search not available"); + } + + my $have_xml_feed = eval { require XML::Feed; 1 } if $indexed; + if ($have_xml_feed) { + $path = "/test/blahblah%40example.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"); + } +} + # redirect list-name-only URLs { local $ENV{HOME} = $home;