config: use description file for gitweb

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

diff --git a/t/cgi.t b/t/cgi.t
index 611fb60423060ef46b4aa8c16ebdcb7646cb3bd5..b59ca54ae15e6d96ea4683e691cd8b5256caf798 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -28,10 +28,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 +42,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 +104,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/<title>test for public-inbox/,
                "set title in XML feed");
        like($res->{body},
                qr!http://test\.example\.com/test/m/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 +120,9 @@ 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!; # dirty...
        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,7 +144,7 @@ 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;