X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_mount.t;h=8cac3502310c75a78930bdb910e2286f39faed14;hb=c29b2b7ded47def906cf00e3baad65c102304120;hp=c1c1b0c642fd96b2adc4454f13c1b5227e6d9bf1;hpb=19e00ca1a6aab8e59f74241fcdfbb768785ff2ff;p=public-inbox.git
diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index c1c1b0c6..8cac3502 100644
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -1,30 +1,26 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2020 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
use Test::More;
use Email::MIME;
-use File::Temp qw/tempdir/;
-my $tmpdir = tempdir('psgi-path-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+use PublicInbox::TestCommon;
+my ($tmpdir, $for_destroy) = tmpdir();
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 URI::Escape);
-foreach my $mod (@mods) {
- eval "require $mod";
- plan skip_all => "$mod missing for plack.t" if $@;
-}
+my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape
+ Plack::Builder Plack::App::URLMap);
+require_mods(@mods);
use_ok $_ foreach @mods;
+use_ok 'PublicInbox::WWW';
use PublicInbox::Import;
use PublicInbox::Git;
use PublicInbox::Config;
-use PublicInbox::WWW;
-use Plack::Builder;
-use Plack::App::URLMap;
-my $config = PublicInbox::Config->new({
- "$cfgpfx.address" => $addr,
- "$cfgpfx.mainrepo" => $maindir,
-});
+my $config = PublicInbox::Config->new(\<new($maindir);
my $im = PublicInbox::Import->new($git, 'test', $addr);
@@ -44,11 +40,11 @@ EOF
}
my $www = PublicInbox::WWW->new($config);
-my $app = builder {
- enable 'Head';
- mount '/a' => builder { sub { $www->call(@_) } };
- mount '/b' => builder { sub { $www->call(@_) } };
-};
+my $app = builder(sub {
+ enable('Head');
+ mount('/a' => builder(sub { sub { $www->call(@_) } }));
+ mount('/b' => builder(sub { sub { $www->call(@_) } }));
+});
test_psgi($app, sub {
my ($cb) = @_;
@@ -60,19 +56,51 @@ test_psgi($app, sub {
unlike($res->content, qr!\b\Qhttp://[^/]+/test/\E!,
'No URLs which are not mount-aware');
- # redirects
+ $res = $cb->(GET('/a/test/new.html'));
+ like($res->content, qr!git clone --mirror http://[^/]+/a/test\b!,
+ 'clone URL in new.html is mount-aware');
+
$res = $cb->(GET('/a/test/blah%40example.com/'));
is($res->code, 200, 'OK with URLMap mount');
+ like($res->content, qr!git clone --mirror http://[^/]+/a/test\b!,
+ 'clone URL in /$INBOX/$MESSAGE_ID/ is mount-aware');
+
$res = $cb->(GET('/a/test/blah%40example.com/raw'));
is($res->code, 200, 'OK with URLMap mount');
+ like($res->content, qr!^List-Archive: !m,
+ 'List-Archive set in /raw mboxrd');
+ like($res->content,
+ qr!^Archived-At: !m,
+ 'Archived-At set in /raw mboxrd');
+
+ # redirects
$res = $cb->(GET('/a/test/m/blah%40example.com.html'));
is($res->header('Location'),
- 'http://localhost/a/test/blah%40example.com/',
+ 'http://localhost/a/test/blah@example.com/',
'redirect functions properly under mount');
$res = $cb->(GET('/test/blah%40example.com/'));
is($res->code, 404, 'intentional 404 with URLMap mount');
-
});
+SKIP: {
+ require_mods(qw(DBD::SQLite Search::Xapian IO::Uncompress::Gunzip), 3);
+ my $ibx = $config->lookup_name('test');
+ require_ok 'PublicInbox::SearchIdx';
+ PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
+ test_psgi($app, sub {
+ my ($cb) = @_;
+ my $res = $cb->(GET('/a/test/blah@example.com/t.mbox.gz'));
+ my $gz = $res->content;
+ my $raw;
+ IO::Uncompress::Gunzip::gunzip(\$gz => \$raw);
+ like($raw, qr!^List-Archive: !m,
+ 'List-Archive set in /t.mbox.gz mboxrd');
+ like($raw,
+ qr!^Archived-At:\x20
+ !mx,
+ 'Archived-At set in /t.mbox.gz mboxrd');
+ });
+}
+
done_testing();