fixup Plack-related requires

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

diff --git a/t/plack.t b/t/plack.t
index 067a59333bdc8a542a20cd861e4dbaafbb733cf7..b77cdba552c516ecaabe3b757d8f732ea75b5865 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
@@ -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 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';
@@ -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'));
@@ -116,7 +139,7 @@ EOF
                my ($cb) = @_;
                my $res = $cb->(GET($pfx . '/blah%40example.com/raw'));
                is(200, $res->code, 'success response received for /*/raw');
-               like($res->content, qr!\AFrom !, "mbox returned");
+               like($res->content, qr!^From !sm, "mbox returned");
        });
 
        # legacy redirects