fixup Plack-related requires

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

diff --git a/t/plack.t b/t/plack.t
index 6c7edb5db42b65001091d3f133ee77e141e772d9..b77cdba552c516ecaabe3b757d8f732ea75b5865 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -20,13 +20,14 @@ my $addr = 'test-public@example.com';
 my $cfgpfx = "publicinbox.test";
 my $failbox = "$home/fail.mbox";
 local $ENV{PI_EMERGENCY} = $failbox;
-
-foreach my $mod (qw(Plack::Test HTTP::Request::Common
-                        Mail::Thread URI::Escape)) {
+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 $@;
 }
 
+foreach my $mod (@mods) { use_ok $mod; }
 {
        ok(-f $psgi, "psgi example file found");
        ok(-x "$main_bin/spamc",
@@ -80,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 missing /");
+                       my $location = $res->header('Location');
+                       like($location, qr!/\Q$t\E/\z!,
+                               'redirected with missing /');
+               });
+       }
+
        test_psgi($app, sub {
                my ($cb) = @_;
                my $atomurl = 'http://example.com/test/new.atom';
@@ -91,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'));