X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_mount.t;h=7c5487f3f99ca9e1bacaafb37863bdeb786d1553;hb=7319f5d318a960eeb32a207d226eea7fd9ce2543;hp=aa7c863f5274421e528c4a4e79d28a48a27b41db;hpb=fece7fca6aeac74410a813cffcb0da338017d0ed;p=public-inbox.git
diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index aa7c863f..7c5487f3 100644
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -1,54 +1,42 @@
-# Copyright (C) 2016-2019 all contributors
+#!perl -w
+# Copyright (C) 2016-2021 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);
-my $maindir = "$tmpdir/main.git";
-my $addr = 'test-public@example.com';
+use v5.10.1;
+use PublicInbox::Eml;
+use PublicInbox::TestCommon;
+use PublicInbox::Config;
+my ($tmpdir, $for_destroy) = tmpdir();
+my $v1dir = "$tmpdir/v1.git";
my $cfgpfx = "publicinbox.test";
-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 $@;
-}
+my @mods = qw(HTTP::Request::Common Plack::Test URI::Escape
+ Plack::Builder Plack::App::URLMap);
+require_mods(@mods);
use_ok $_ foreach @mods;
-use PublicInbox::Import;
-use PublicInbox::Git;
-use PublicInbox::Config;
-use PublicInbox::WWW;
-use Plack::Builder;
-use Plack::App::URLMap;
-my $config = PublicInbox::Config->new(\<new($maindir);
-my $im = PublicInbox::Import->new($git, 'test', $addr);
-{
- my $mime = Email::MIME->new(< $v1dir, sub {
+ my ($im, $ibx) = @_;
+ $im->add(PublicInbox::Eml->new(<
To: You
-Cc: $addr
+Cc: $ibx->{-primary_address}
Message-Id:
Subject: hihi
Date: Thu, 01 Jan 1970 00:00:00 +0000
zzzzzz
EOF
- $im->add($mime);
- $im->done;
-}
-
-my $www = PublicInbox::WWW->new($config);
-my $app = builder {
- enable 'Head';
- mount '/a' => builder { sub { $www->call(@_) } };
- mount '/b' => builder { sub { $www->call(@_) } };
};
+my $cfg = PublicInbox::Config->new(\<{-primary_address}
+$cfgpfx.inboxdir=$v1dir
+EOF
+my $www = PublicInbox::WWW->new($cfg);
+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,22 +48,15 @@ test_psgi($app, sub {
unlike($res->content, qr!\b\Qhttp://[^/]+/test/\E!,
'No URLs which are not mount-aware');
- $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/_/text/mirror/'));
+ like($res->content, qr!git clone --mirror\s+.*?http://[^/]+/a/test\b!s,
+ 'clone URL in /text/mirror 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');
+ qr/^Message-Id: \n/sm,
+ 'headers appear in /raw');
# redirects
$res = $cb->(GET('/a/test/m/blah%40example.com.html'));
@@ -88,11 +69,8 @@ test_psgi($app, sub {
});
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');
+ require_mods(qw(DBD::SQLite Search::Xapian IO::Uncompress::Gunzip), 3);
+ require_ok 'PublicInbox::SearchIdx';
PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
test_psgi($app, sub {
my ($cb) = @_;
@@ -100,12 +78,8 @@ SKIP: {
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');
+ like($raw, qr!^Message-Id:\x20\n!sm,
+ 'headers appear in /t.mbox.gz mboxrd');
});
}