X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_mount.t;h=7160896bb6c2f5071f6e7572ba5e643e89a73938;hb=dde1b083571ed893cbb1990f01f9e11ed804cba5;hp=c1c1b0c642fd96b2adc4454f13c1b5227e6d9bf1;hpb=19e00ca1a6aab8e59f74241fcdfbb768785ff2ff;p=public-inbox.git
diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index c1c1b0c6..7160896b 100644
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors
+# Copyright (C) 2016-2019 all contributors
# License: AGPL-3.0+
use strict;
use warnings;
@@ -9,7 +9,7 @@ my $tmpdir = tempdir('psgi-path-XXXXXX', TMPDIR => 1, CLEANUP => 1);
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);
+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 $@;
@@ -21,10 +21,10 @@ 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);
@@ -60,19 +60,53 @@ 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: {
+ my @mods = qw(DBI DBD::SQLite Search::Xapian IO::Uncompress::Gunzip);
+ foreach my $mod (@mods) {
+ eval "require $mod" or skip "$mod not available: $@", 2;
+ }
+ my $ibx = $config->lookup_name('test');
+ 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();