No ext_urls

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

diff --git a/t/psgi_search.t b/t/psgi_search.t
index 9facdf3d13f25b7c76d39996d34431bae6339185..27946391cfd3030cc4fa6d6356ed7ec4f53cbc95 100644 (file)
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -1,15 +1,13 @@
-# Copyright (C) 2017-2021 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 v5.10.1;
+use PublicInbox::TestCommon;
 use IO::Uncompress::Gunzip qw(gunzip);
 use PublicInbox::Eml;
 use PublicInbox::Config;
 use PublicInbox::Inbox;
-use PublicInbox::InboxWritable;
-use bytes (); # only for bytes::length
-use PublicInbox::TestCommon;
 my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
                URI::Escape Plack::Builder);
 require_mods(@mods);
@@ -19,58 +17,46 @@ use_ok 'PublicInbox::SearchIdx';
 my ($tmpdir, $for_destroy) = tmpdir();
 local $ENV{TZ} = 'UTC';
 
-my $ibx = PublicInbox::Inbox->new({
-       inboxdir => $tmpdir,
-       address => 'git@vger.kernel.org',
-       name => 'test',
-});
-$ibx = PublicInbox::InboxWritable->new($ibx);
-$ibx->init_inbox(1);
-my $im = $ibx->importer(0);
 my $digits = '10010260936330';
 my $ua = 'Pine.LNX.4.10';
 my $mid = "$ua.$digits.2460-100000\@penguin.transmeta.com";
-
-# n.b. these headers are not properly RFC2047-encoded
-my $mime = PublicInbox::Eml->new(<<EOF);
+my $ibx = create_inbox 'git', indexlevel => 'full', tmpdir => "$tmpdir/1", sub {
+       my ($im) = @_;
+       # n.b. these headers are not properly RFC2047-encoded
+       $im->add(PublicInbox::Eml->new(<<EOF)) or BAIL_OUT;
 Subject: test Ævar
 Message-ID: <$mid>
 From: Ævar Arnfjörð Bjarmason <avarab\@example>
 To: git\@vger.kernel.org
 
 EOF
-$im->add($mime);
 
-$im->add(PublicInbox::Eml->new(<<""));
+       $im->add(PublicInbox::Eml->new(<<"")) or BAIL_OUT;
 Message-ID: <reply\@asdf>
 From: replier <r\@example.com>
 In-Reply-To: <$mid>
 Subject: mismatch
 
-$mime = PublicInbox::Eml->new(<<'EOF');
+       $im->add(PublicInbox::Eml->new(<<'EOF')) or BAIL_OUT;
 Subject:
 Message-ID: <blank-subject@example.com>
 From: blank subject <blank-subject@example.com>
 To: git@vger.kernel.org
 
 EOF
-$im->add($mime);
 
-$mime = PublicInbox::Eml->new(<<'EOF');
+       $im->add(PublicInbox::Eml->new(<<'EOF')) or BAIL_OUT;
 Message-ID: <no-subject-at-all@example.com>
 From: no subject at all <no-subject-at-all@example.com>
 To: git@vger.kernel.org
 
 EOF
-$im->add($mime);
-
-$im->done;
-PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
+};
 
 my $cfgpfx = "publicinbox.test";
 my $cfg = PublicInbox::Config->new(\<<EOF);
 $cfgpfx.address=git\@vger.kernel.org
-$cfgpfx.inboxdir=$tmpdir
+$cfgpfx.inboxdir=$ibx->{inboxdir}
 EOF
 my $www = PublicInbox::WWW->new($cfg);
 test_psgi(sub { $www->call(@_) }, sub {
@@ -101,8 +87,13 @@ test_psgi(sub { $www->call(@_) }, sub {
        is($res->code, 200, 'successful search result');
        is_deeply([], $warn, 'no warnings from non-numeric comparison');
 
+       $res = $cb->(GET('/test/?&q=s:test'));
+       is($res->code, 200, 'successful search result');
+       is_deeply([], $warn, 'no warnings from black parameter');
+
        $res = $cb->(POST('/test/?q=s:bogus&x=m'));
        is($res->code, 404, 'failed search result gives 404');
+       like($res->content, qr/No results found/, "`No results' shown");
        is_deeply([], $warn, 'no warnings');
 
        my $mid_re = qr/\Q$mid\E/o;
@@ -113,6 +104,11 @@ test_psgi(sub { $www->call(@_) }, sub {
                like($res->content, $mid_re, 'found mid in response');
                chop($digits);
        }
+       $res = $cb->(GET("/test/$mid/"));
+       $html = $res->content;
+       like($html, qr/\bFrom: &#198;var /,
+               "displayed Ævar's name properly in permalink From:");
+       unlike($html, qr/&#195;/, 'no raw octets in permalink HTML');
 
        $res = $cb->(GET('/test/'));
        $html = $res->content;