search: support alt-ID for mapping legacy serial numbers

[public-inbox.git] / t / cgi.t

diff --git a/t/cgi.t b/t/cgi.t
index d7e3ac5b0173a886773abf8674dc39d0f457f8ec..a0f09c594a1127070d8f40ad7ed5e6b1ceca6b4a 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -1,30 +1,27 @@
 # Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# 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('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)");
@@ -42,15 +39,18 @@ my $cfgpfx = "publicinbox.test";
        }
 }
 
-my $failbox = "$home/fail.mbox";
-local $ENV{PI_EMERGENCY} = $failbox;
+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);
+
 {
        local $ENV{HOME} = $home;
-       local $ENV{ORIGINAL_RECIPIENT} = $addr;
 
        # ensure successful message delivery
        {
-               my $simple = Email::Simple->new(<<EOF);
+               my $mime = Email::MIME->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -60,16 +60,15 @@ 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`;
+               $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");
        }
 
        # deliver a reply, too
        {
-               my $reply = Email::Simple->new(<<EOF);
+               my $reply = Email::MIME->new(<<EOF);
 From: You <you\@example.com>
 To: Me <me\@example.com>
 Cc: $addr
@@ -83,10 +82,9 @@ 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`;
+               $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");
        }
 
@@ -133,26 +131,11 @@ EOF
        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
-}
-
 # message-id pages
 {
        local $ENV{HOME} = $home;
        my $slashy_mid = 'slashy/asdf@example.com';
-       my $reply = Email::Simple->new(<<EOF);
+       my $reply = Email::MIME->new(<<EOF);
 From: You <you\@example.com>
 To: Me <me\@example.com>
 Cc: $addr
@@ -162,14 +145,8 @@ 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($reply);
+       $im->done;
 
        my $res = cgi_run("/test/slashy%2fasdf%40example.com/raw");
        like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/,
@@ -195,7 +172,7 @@ EOF
        $res = cgi_run("/test/blahblah\@example.con/");
        like($res->{head}, qr/Status: 300 Multiple Choices/, "mid html miss");
 
-       $res = cgi_run("/test/");
+       $res = cgi_run("/test/new.html");
        like($res->{body}, qr/slashy%2Fasdf%40example\.com/,
                "slashy URL generated correctly");
 }
@@ -203,7 +180,6 @@ EOF
 # 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");
@@ -248,7 +224,7 @@ 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 => $init);
 }
 
 sub cgi_run {