use ORIGINAL_RECIPIENT once again

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

diff --git a/t/cgi.t b/t/cgi.t
index 3ae879812fa0ca99de383f5cc099fe2d8a78716f..f7035228e29534a70ebda7faeedbd99e82b2c6a0 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -40,10 +40,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
        {
@@ -121,8 +121,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
 }
 
@@ -134,7 +135,6 @@ EOF
 From: You <you\@example.com>
 To: Me <me\@example.com>
 Cc: $addr
-In-Reply-To: <blah\@example.com>
 Message-Id: <$slashy_mid>
 Subject: Re: hihi
 Date: Thu, 01 Jan 1970 00:00:01 +0000
@@ -145,7 +145,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;
@@ -157,10 +157,6 @@ EOF
        $res = cgi_run("/test/m/blahblah\@example.com.txt");
        like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/,
                "mid.txt hit");
-
-       my $pfx = cgi_run("/prefixed/test/m/blahblah\@example.com.txt");
-       is_deeply($pfx, $res, "we do not have to be a top-level URL");
-
        $res = cgi_run("/test/m/blahblah\@example.con.txt");
        like($res->{head}, qr/Status: 404 Not Found/, "mid.txt miss");
 
@@ -175,13 +171,18 @@ EOF
        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/");
+       like($res->{body}, qr/slashy%2Fasdf%40example\.com/,
+               "slashy URL generated correctly");
 }
 
+# redirect list-name-only URLs
 {
        local $ENV{HOME} = $home;
-       my $res = cgi_run("/test/");
-       like($res->{body}, qr/slashy%2Fasdf%40example\.com/,
-               "slashy URL generated correctly");
+       my $res = cgi_run("/test");
+       like($res->{head}, qr/Status: 301 Moved/, "redirected status");
+       like($res->{head}, qr!/test/!, "redirected with slash");
 }
 
 done_testing();