www: redirect /$MESSAGE_ID/f/ endpoints

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

diff --git a/t/plack.t b/t/plack.t
index 31ec58daa99761eff6e9a1664a60c3391711f066..1ae58731ec370bb2a8fe01547023db9861026748 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -9,7 +9,7 @@ use Cwd;
 use IPC::Run qw/run/;
 my $psgi = "examples/public-inbox.psgi";
 my $mda = "blib/script/public-inbox-mda";
-my $tmpdir = tempdir(CLEANUP => 1);
+my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $home = "$tmpdir/pi-home";
 my $pi_home = "$home/.public-inbox";
 my $pi_config = "$pi_home/config";
@@ -20,15 +20,15 @@ my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
 my $failbox = "$home/fail.mbox";
 local $ENV{PI_EMERGENCY} = $failbox;
+my @mods = qw(HTTP::Request::Common Plack::Request Plack::Test
+       Mail::Thread URI::Escape);
+foreach my $mod (@mods) {
+       eval "require $mod";
+       plan skip_all => "$mod missing for plack.t" if $@;
+}
 
-our $have_plack;
-eval {
-       require Plack::Request;
-       eval 'use Plack::Test; use HTTP::Request::Common';
-       $have_plack = 1;
-};
-SKIP: {
-       skip 'Plack not installed', 1 unless $have_plack;
+foreach my $mod (@mods) { use_ok $mod; }
+{
        ok(-f $psgi, "psgi example file found");
        ok(-x "$main_bin/spamc",
                "spamc ham mock found (run in top of source tree");
@@ -81,6 +81,30 @@ EOF
                is($to, $res->header('Location'), 'redirect location matches');
        });
 
+       my $pfx = 'http://example.com/test';
+       foreach my $t (qw(t T)) {
+               test_psgi($app, sub {
+                       my ($cb) = @_;
+                       my $u = $pfx . "/blah%40example.com/$t";
+                       my $res = $cb->(GET($u));
+                       is(301, $res->code, "redirect for missing /");
+                       my $location = $res->header('Location');
+                       like($location, qr!/\Q$t\E/#u\z!,
+                               'redirected with missing /');
+               });
+       }
+       foreach my $t (qw(f)) {
+               test_psgi($app, sub {
+                       my ($cb) = @_;
+                       my $u = $pfx . "/blah%40example.com/$t";
+                       my $res = $cb->(GET($u));
+                       is(301, $res->code, "redirect for legacy /f");
+                       my $location = $res->header('Location');
+                       like($location, qr!/blah%40example\.com/\z!,
+                               'redirected with missing /');
+               });
+       }
+
        test_psgi($app, sub {
                my ($cb) = @_;
                my $atomurl = 'http://example.com/test/new.atom';
@@ -92,7 +116,6 @@ EOF
                        'index generated');
        });
 
-       my $pfx = 'http://example.com/test';
        test_psgi($app, sub {
                my ($cb) = @_;
                my $res = $cb->(GET($pfx . '/atom.xml'));
@@ -102,16 +125,22 @@ EOF
                        'atom feed generated correct URL');
        });
 
-       foreach my $t (('', 'f/')) {
-               test_psgi($app, sub {
-                       my ($cb) = @_;
-                       my $path = "/blah%40example.com/$t";
-                       my $res = $cb->(GET($pfx . $path));
-                       is(200, $res->code, "success for $path");
-                       like($res->content, qr!<title>hihi - Me</title>!,
-                               "HTML returned");
-               });
-       }
+       test_psgi($app, sub {
+               my ($cb) = @_;
+               my $path = '/blah%40example.com/';
+               my $res = $cb->(GET($pfx . $path));
+               is(200, $res->code, "success for $path");
+               like($res->content, qr!<title>hihi - Me</title>!,
+                       "HTML returned");
+
+               $path .= 'f/';
+               $res = $cb->(GET($pfx . $path));
+               is(301, $res->code, "redirect for $path");
+               my $location = $res->header('Location');
+               like($location, qr!/blah%40example\.com/\z!,
+                       '/$MESSAGE_ID/f/ redirected to /$MESSAGE_ID/');
+       });
+
        test_psgi($app, sub {
                my ($cb) = @_;
                my $res = $cb->(GET($pfx . '/blah%40example.com/raw'));
@@ -133,7 +162,7 @@ EOF
 
        my %umap = (
                'm' => '',
-               'f' => 'f/',
+               'f' => '',
                't' => 't/',
        );
        while (my ($t, $e) = each %umap) {