diff options
Diffstat (limited to 't/psgi_mount.t')
| -rw-r--r-- | t/psgi_mount.t | 70 |
1 files changed, 24 insertions, 46 deletions
diff --git a/t/psgi_mount.t b/t/psgi_mount.t index 8cac3502..e43b9f2d 100644 --- a/t/psgi_mount.t +++ b/t/psgi_mount.t @@ -1,45 +1,35 @@ -# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org> +#!perl -w +# Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> -use strict; -use warnings; -use Test::More; -use Email::MIME; +use v5.12; +use PublicInbox::Eml; use PublicInbox::TestCommon; my ($tmpdir, $for_destroy) = tmpdir(); -my $maindir = "$tmpdir/main.git"; -my $addr = 'test-public@example.com'; -my $cfgpfx = "publicinbox.test"; +my $v1dir = "$tmpdir/v1.git"; 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; -my $config = PublicInbox::Config->new(\<<EOF); -$cfgpfx.address=$addr -$cfgpfx.inboxdir=$maindir -EOF -is(0, system(qw(git init -q --bare), $maindir), "git init (main)"); -my $git = PublicInbox::Git->new($maindir); -my $im = PublicInbox::Import->new($git, 'test', $addr); -{ - my $mime = Email::MIME->new(<<EOF); +my $ibx = create_inbox 'test', tmpdir => $v1dir, sub { + my ($im, $ibx) = @_; + $im->add(PublicInbox::Eml->new(<<EOF)) or BAIL_OUT; From: Me <me\@example.com> To: You <you\@example.com> -Cc: $addr +Cc: $ibx->{-primary_address} Message-Id: <blah\@example.com> 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 $cfg = cfg_new $tmpdir, <<EOF; +[publicinbox "test"] + address = $ibx->{-primary_address} + inboxdir = $v1dir +EOF +my $www = PublicInbox::WWW->new($cfg); my $app = builder(sub { enable('Head'); mount('/a' => builder(sub { sub { $www->call(@_) } })); @@ -56,22 +46,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: <http://[^/]+/a/test/>!m, - 'List-Archive set in /raw mboxrd'); like($res->content, - qr!^Archived-At: <http://[^/]+/a/test/blah\@example\.com/>!m, - 'Archived-At set in /raw mboxrd'); + qr/^Message-Id: <blah\@example\.com>\n/sm, + 'headers appear in /raw'); # redirects $res = $cb->(GET('/a/test/m/blah%40example.com.html')); @@ -84,8 +67,7 @@ test_psgi($app, sub { }); SKIP: { - require_mods(qw(DBD::SQLite Search::Xapian IO::Uncompress::Gunzip), 3); - my $ibx = $config->lookup_name('test'); + require_mods(qw(DBD::SQLite Xapian IO::Uncompress::Gunzip), 3); require_ok 'PublicInbox::SearchIdx'; PublicInbox::SearchIdx->new($ibx, 1)->index_sync; test_psgi($app, sub { @@ -94,12 +76,8 @@ SKIP: { my $gz = $res->content; my $raw; IO::Uncompress::Gunzip::gunzip(\$gz => \$raw); - like($raw, qr!^List-Archive: <http://[^/]+/a/test/>!m, - 'List-Archive set in /t.mbox.gz mboxrd'); - like($raw, - qr!^Archived-At:\x20 - <http://[^/]+/a/test/blah\@example\.com/>!mx, - 'Archived-At set in /t.mbox.gz mboxrd'); + like($raw, qr!^Message-Id:\x20<blah\@example\.com>\n!sm, + 'headers appear in /t.mbox.gz mboxrd'); }); } |