X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=95e6e7356a5dba7739d1f33e499cbce28fa35baf;hb=refs%2Fheads%2Fmaster;hp=96c627c384e8d3ce1acf1c3a83d3eba0140d280b;hpb=238e593609daf5de1011519afef1691b529e6229;p=public-inbox.git diff --git a/t/cgi.t b/t/cgi.t index 96c627c3..95e6e735 100644 --- a/t/cgi.t +++ b/t/cgi.t @@ -1,71 +1,38 @@ -# Copyright (C) 2014-2020 all contributors +#!perl -w +# Copyright (C) 2014-2021 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 PublicInbox::Eml; +use v5.10.1; use PublicInbox::TestCommon; -use PublicInbox::Import; -require_mods(qw(Plack::Handler::CGI Plack::Util)); +use IO::Uncompress::Gunzip qw(gunzip); +use PublicInbox::Eml; +use IO::Handle; 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'; - -{ - is(1, mkdir($home, 0755), "setup ~/ for testing"); - is(1, mkdir($pi_home, 0755), "setup ~/.public-inbox"); - PublicInbox::Import::init_bare($maindir); - - open my $fh, '>', "$maindir/description" or die "open: $!\n"; - print $fh "test for public-inbox\n"; - close $fh or die "close: $!\n"; - open $fh, '>>', $pi_config or die; - print $fh <new($pi_config); -my $ibx = $cfg->lookup_name('test'); -my $im = PublicInbox::InboxWritable->new($ibx)->importer(0); - -{ - local $ENV{HOME} = $home; - - # inject some messages: - my $mime = PublicInbox::Eml->new(< "$tmpdir/test", sub { + my ($im, $ibx) = @_; + mkdir "$ibx->{inboxdir}/home", 0755 or BAIL_OUT; + mkdir "$ibx->{inboxdir}/home/.public-inbox", 0755 or BAIL_OUT; + my $eml = PublicInbox::Eml->new(< To: You -Cc: $addr +Cc: $ibx->{-primary_address} Message-Id: Subject: hihi Date: Thu, 01 Jan 1970 00:00:00 +0000 zzzzzz EOF - ok($im->add($mime), 'added initial message'); - - $mime->header_set('Message-ID', ''); - $mime->body_str_set("z\n" x 1024); - ok($im->add($mime), 'added big message'); + $im->add($eml) or BAIL_OUT; + $eml->header_set('Message-ID', ''); + $eml->body_set("z\n" x 1024); + $im->add($eml) or BAIL_OUT; - # deliver a reply, too - $mime = PublicInbox::Eml->new(<new(< To: Me -Cc: $addr +Cc: $ibx->{-primary_address} In-Reply-To: Message-Id: Subject: Re: hihi @@ -76,46 +43,54 @@ Me wrote: what? EOF - ok($im->add($mime), 'added reply'); - - my $slashy_mid = 'slashy/asdf@example.com'; - my $slashy = PublicInbox::Eml->new(<add($eml) or BAIL_OUT; + $eml = PublicInbox::Eml->new(< To: Me -Cc: $addr +Cc: $ibx->{-primary_address} Message-Id: <$slashy_mid> Subject: Re: hihi Date: Thu, 01 Jan 1970 00:00:01 +0000 slashy EOF - ok($im->add($slashy), 'added slash'); - $im->done; + $im->add($eml) or BAIL_OUT; +}; # create_inbox +my $home = "$ibx->{inboxdir}/home"; +open my $cfgfh, '>>', "$home/.public-inbox/config" or BAIL_OUT $!; +print $cfgfh <{-primary_address} + inboxdir = $ibx->{inboxdir} +EOF +$cfgfh->flush or BAIL_OUT $!; + +{ + local $ENV{HOME} = $home; my $res = cgi_run("/test/slashy/asdf\@example.com/raw"); like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/, "slashy mid raw hit"); } # retrieve thread as an mbox -{ +SKIP: { local $ENV{HOME} = $home; 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 $cmd = ['-index', $ibx->{inboxdir}, '--max-size=2k']; + print $cfgfh "\tindexlevel = basic\n" or BAIL_OUT $!; + $cfgfh->flush or BAIL_OUT $!; my $opt = { 2 => \(my $err) }; my $indexed = run_script($cmd, undef, $opt); 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"); - }; + my $in = $res->{body}; + my $out; + gunzip(\$in => \$out); + like($out, qr/^From /m, "From lines in mbox"); $res = cgi_run('/test/toobig@example.com/'); like($res->{head}, qr/^Status: 300 /, 'did not index or return >max-size message'); @@ -123,29 +98,24 @@ EOF 'warned about skipping large OID'); } else { like($res->{head}, qr/^Status: 501 /, "search not available"); - SKIP: { skip 'DBD::SQLite not available', 4 }; - } - - 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 $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::TreePP missing', 2 }; + skip('DBD::SQLite not available', 7); # (4 - 1) above, 4 below } + require_mods('XML::TreePP', 4); + $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 $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'); } done_testing(); sub cgi_run { - my %env = ( + my $env = { PATH_INFO => $_[0], QUERY_STRING => $_[1] || "", SCRIPT_NAME => '', @@ -154,11 +124,11 @@ sub cgi_run { GATEWAY_INTERFACE => 'CGI/1.1', HTTP_ACCEPT => '*/*', HTTP_HOST => 'test.example.com', - ); + }; my ($in, $out, $err) = ("", "", ""); my $rdr = { 0 => \$in, 1 => \$out, 2 => \$err }; - run_script(['.cgi'], \%env, $rdr); - die "unexpected error: \$?=$? ($err)" if $?; + run_script(['.cgi'], $env, $rdr); + fail "unexpected error: \$?=$? ($err)" if $?; my ($head, $body) = split(/\r\n\r\n/, $out, 2); { head => $head, body => $body, err => $err } }