X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fplack.t;h=26b03660d0ab110b822e02fbc3b2e10238c63f27;hb=3d41aa23f35501ca92aab8aa42980fa73f7fa74f;hp=a4f324571ac12fe3e739b3f788a5a33b9de74f0c;hpb=589199dcfebcb96ab77fff6043ecb142b948f824;p=public-inbox.git
diff --git a/t/plack.t b/t/plack.t
index a4f32457..26b03660 100644
--- a/t/plack.t
+++ b/t/plack.t
@@ -1,18 +1,17 @@
-# Copyright (C) 2014-2015 all contributors
-# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
+# Copyright (C) 2014-2018 all contributors
+# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
use Email::MIME;
use File::Temp qw/tempdir/;
-my $psgi = "examples/public-inbox.psgi";
+my $psgi = "./examples/public-inbox.psgi";
my $tmpdir = tempdir('pi-plack-XXXXXX', TMPDIR => 1, CLEANUP => 1);
my $pi_config = "$tmpdir/config";
my $maindir = "$tmpdir/main.git";
my $addr = 'test-public@example.com';
my $cfgpfx = "publicinbox.test";
-my @mods = qw(HTTP::Request::Common Plack::Request Plack::Test
- Mail::Thread URI::Escape);
+my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape);
foreach my $mod (@mods) {
eval "require $mod";
plan skip_all => "$mod missing for plack.t" if $@;
@@ -97,7 +96,7 @@ EOF
foreach my $t (qw(t T)) {
test_psgi($app, sub {
my ($cb) = @_;
- my $u = $pfx . "/blah%40example.com/$t";
+ my $u = $pfx . "/blah\@example.com/$t";
my $res = $cb->(GET($u));
is(301, $res->code, "redirect for missing /");
my $location = $res->header('Location');
@@ -108,11 +107,11 @@ EOF
foreach my $t (qw(f)) {
test_psgi($app, sub {
my ($cb) = @_;
- my $u = $pfx . "/blah%40example.com/$t";
+ my $u = $pfx . "/blah\@example.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!,
+ like($location, qr!/blah\@example\.com/\z!,
'redirected with missing /');
});
}
@@ -120,11 +119,11 @@ EOF
test_psgi($app, sub {
my ($cb) = @_;
my $atomurl = 'http://example.com/test/new.atom';
- my $res = $cb->(GET('http://example.com/test/'));
+ my $res = $cb->(GET('http://example.com/test/new.html'));
is(200, $res->code, 'success response received');
- like($res->content, qr!href="\Q$atomurl\E"!,
+ like($res->content, qr!href="new\.atom"!,
'atom URL generated');
- like($res->content, qr!href="blah%40example\.com/"!,
+ like($res->content, qr!href="blah\@example\.com/"!,
'index generated');
});
@@ -133,13 +132,13 @@ EOF
my $res = $cb->(GET($pfx . '/atom.xml'));
is(200, $res->code, 'success response received for atom');
like($res->content,
- qr!link\s+href="\Q$pfx\E/blah%40example\.com/"!s,
+ qr!link\s+href="\Q$pfx\E/blah\@example\.com/"!s,
'atom feed generated correct URL');
});
test_psgi($app, sub {
my ($cb) = @_;
- my $path = '/blah%40example.com/';
+ my $path = '/blah@example.com/';
my $res = $cb->(GET($pfx . $path));
is(200, $res->code, "success for $path");
like($res->content, qr!hihi - Me!,
@@ -149,13 +148,13 @@ EOF
$res = $cb->(GET($pfx . $path));
is(301, $res->code, "redirect for $path");
my $location = $res->header('Location');
- like($location, qr!/blah%40example\.com/\z!,
+ like($location, qr!/blah\@example\.com/\z!,
'/$MESSAGE_ID/f/ redirected to /$MESSAGE_ID/');
});
test_psgi($app, sub {
my ($cb) = @_;
- my $res = $cb->(GET($pfx . '/blah%40example.com/raw'));
+ my $res = $cb->(GET($pfx . '/blah@example.com/raw'));
is(200, $res->code, 'success response received for /*/raw');
like($res->content, qr!^From !sm, "mbox returned");
});
@@ -164,10 +163,10 @@ EOF
foreach my $t (qw(m f)) {
test_psgi($app, sub {
my ($cb) = @_;
- my $res = $cb->(GET($pfx . "/$t/blah%40example.com.txt"));
+ my $res = $cb->(GET($pfx . "/$t/blah\@example.com.txt"));
is(301, $res->code, "redirect for old $t .txt link");
my $location = $res->header('Location');
- like($location, qr!/blah%40example\.com/raw\z!,
+ like($location, qr!/blah\@example\.com/raw\z!,
".txt redirected to /raw");
});
}
@@ -180,22 +179,22 @@ EOF
while (my ($t, $e) = each %umap) {
test_psgi($app, sub {
my ($cb) = @_;
- my $res = $cb->(GET($pfx . "/$t/blah%40example.com.html"));
+ my $res = $cb->(GET($pfx . "/$t/blah\@example.com.html"));
is(301, $res->code, "redirect for old $t .html link");
my $location = $res->header('Location');
like($location,
- qr!/blah%40example\.com/$e(?:#u)?\z!,
+ qr!/blah\@example\.com/$e(?:#u)?\z!,
".html redirected to new location");
});
}
foreach my $sfx (qw(mbox mbox.gz)) {
test_psgi($app, sub {
my ($cb) = @_;
- my $res = $cb->(GET($pfx . "/t/blah%40example.com.$sfx"));
+ my $res = $cb->(GET($pfx . "/t/blah\@example.com.$sfx"));
is(301, $res->code, 'redirect for old thread link');
my $location = $res->header('Location');
like($location,
- qr!/blah%40example\.com/t\.mbox(?:\.gz)?\z!,
+ qr!/blah\@example\.com/t\.mbox(?:\.gz)?\z!,
"$sfx redirected to /mbox.gz");
});
}