X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fcgi.t;h=9f67d5c0bd0004d89275c0d4e22a615993c3bc48;hb=55b707d788ce13696e4411389583e720ea6dab01;hp=e705cd76a77b0203aa4ecfccaa529047adb209c3;hpb=8c00f5572466200df6112b0f8401005e9377e5f8;p=public-inbox.git diff --git a/t/cgi.t b/t/cgi.t index e705cd76..9f67d5c0 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,13 @@ 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; +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 +22,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,14 +71,9 @@ Me wrote: what? EOF $im->add($reply); - $im->done; -} -# message-id pages -{ - local $ENV{HOME} = $home; my $slashy_mid = 'slashy/asdf@example.com'; - my $reply = Email::MIME->new(<new(< To: Me Cc: $addr @@ -94,30 +83,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 @@ -126,7 +97,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"); @@ -139,6 +117,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; @@ -151,16 +130,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], @@ -173,7 +149,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 } }