nntp+www: drop List-* and Archived-At headers

[public-inbox.git] / t / psgi_mount.t

diff --git a/t/psgi_mount.t b/t/psgi_mount.t
index aa7c863f5274421e528c4a4e79d28a48a27b41db..48d8e5c0847f0f83cf8de211d19ebd16cca5ee2a 100644 (file)
--- a/t/psgi_mount.t
+++ b/t/psgi_mount.t
@@ -1,35 +1,31 @@
-# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2020 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 File::Temp qw/tempdir/;
-my $tmpdir = tempdir('psgi-path-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+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 @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_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(\<<EOF);
+my $cfg = 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);
+$im->init_bare;
 {
-       my $mime = Email::MIME->new(<<EOF);
+       my $mime = PublicInbox::Eml->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -43,12 +39,12 @@ EOF
        $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 $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) = @_;
@@ -71,11 +67,9 @@ test_psgi($app, sub {
 
        $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'));
@@ -88,11 +82,9 @@ 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);
+       my $ibx = $cfg->lookup_name('test');
+       require_ok 'PublicInbox::SearchIdx';
        PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
        test_psgi($app, sub {
                my ($cb) = @_;
@@ -100,12 +92,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');
        });
 }