X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_search.t;h=5d537363d3aa46f80ae49a38d1f6fe38debb6cc0;hb=86c28d2432292c6bee149f59175486e5610e4462;hp=1adc1d6e4e0eb7c8cb7384947feb0dddc6769ee9;hpb=e220b8b2ee5cfd458167dc2c6c92726352c4c80e;p=public-inbox.git

diff --git a/t/psgi_search.t b/t/psgi_search.t
index 1adc1d6e..5d537363 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -1,56 +1,69 @@
-# Copyright (C) 2017-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2017-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 File::Temp qw/tempdir/;
-use Email::MIME;
+use PublicInbox::Eml;
 use PublicInbox::Config;
-use PublicInbox::WWW;
+use PublicInbox::Inbox;
+use PublicInbox::InboxWritable;
 use bytes (); # only for bytes::length
-my @mods = qw(Search::Xapian HTTP::Request::Common Plack::Test
+use PublicInbox::TestCommon;
+my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
 		URI::Escape Plack::Builder);
-foreach my $mod (@mods) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for psgi_search.t" if $@;
-}
-use_ok $_ foreach (@mods, qw(PublicInbox::SearchIdx));
-my $tmpdir = tempdir('pi-psgi-search.XXXXXX', TMPDIR => 1, CLEANUP => 1);
-my $git_dir = "$tmpdir/a.git";
-
-is(0, system(qw(git init -q --bare), $git_dir), "git init (main)");
-my $rw = PublicInbox::SearchIdx->new($git_dir, 1);
-ok($rw, "search indexer created");
+require_mods(@mods);
+use_ok($_) for (qw(HTTP::Request::Common Plack::Test));
+use_ok 'PublicInbox::WWW';
+use_ok 'PublicInbox::SearchIdx';
+my ($tmpdir, $for_destroy) = tmpdir();
+
+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";
-my $data = <<"EOF";
-Subject: test
+
+# n.b. these headers are not properly RFC2047-encoded
+my $mime = PublicInbox::Eml->new(<<EOF);
+Subject: test Ævar
 Message-ID: <$mid>
 From: Ævar Arnfjörð Bjarmason <avarab\@example>
 To: git\@vger.kernel.org
 
 EOF
+$im->add($mime);
 
-my $num = 0;
-# nb. using internal API, fragile!
-$rw->begin_txn_lazy;
+$mime = PublicInbox::Eml->new(<<'EOF');
+Subject:
+Message-ID: <blank-subject@example.com>
+From: blank subject <blank-subject@example.com>
+To: git@vger.kernel.org
 
-foreach (reverse split(/\n\n/, $data)) {
-	$_ .= "\n";
-	my $mime = Email::MIME->new(\$_);
-	my $bytes = bytes::length($mime->as_string);
-	my $doc_id = $rw->add_message($mime, $bytes, ++$num, 'ignored');
-	ok($doc_id, 'message added');
-}
+EOF
+$im->add($mime);
+
+$mime = PublicInbox::Eml->new(<<'EOF');
+Message-ID: <no-subject-at-all@example.com>
+From: no subject at all <no-subject-at-all@example.com>
+To: git@vger.kernel.org
 
-$rw->commit_txn_lazy;
+EOF
+$im->add($mime);
+
+$im->done;
+PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
 
 my $cfgpfx = "publicinbox.test";
-my $config = PublicInbox::Config->new({
-	"$cfgpfx.address" => 'git@vger.kernel.org',
-	"$cfgpfx.mainrepo" => $git_dir,
-});
+my $config = PublicInbox::Config->new(\<<EOF);
+$cfgpfx.address=git\@vger.kernel.org
+$cfgpfx.inboxdir=$tmpdir
+EOF
 my $www = PublicInbox::WWW->new($config);
 test_psgi(sub { $www->call(@_) }, sub {
 	my ($cb) = @_;
@@ -84,6 +97,27 @@ test_psgi(sub { $www->call(@_) }, sub {
 		like($res->content, $mid_re, 'found mid in response');
 		chop($digits);
 	}
+
+	$res = $cb->(GET('/test/'));
+	$html = $res->content;
+	like($html, qr/\bhref="no-subject-at-all[^>]+>\(no subject\)</,
+		'subject-less message linked from "/$INBOX/"');
+	like($html, qr/\bhref="blank-subject[^>]+>\(no subject\)</,
+		'blank subject message linked from "/$INBOX/"');
+	like($html, qr/test &#198;var/,
+		"displayed Ævar's name properly in topic view");
+
+	$res = $cb->(GET('/test/?q=tc:git'));
+	like($html, qr/\bhref="no-subject-at-all[^>]+>\(no subject\)</,
+		'subject-less message linked from "/$INBOX/?q=..."');
+	like($html, qr/\bhref="blank-subject[^>]+>\(no subject\)</,
+		'blank subject message linked from "/$INBOX/?q=..."');
+	$res = $cb->(GET('/test/no-subject-at-all@example.com/raw'));
+	like($res->header('Content-Disposition'),
+		qr/filename=no-subject\.txt/);
+	$res = $cb->(GET('/test/no-subject-at-all@example.com/t.mbox.gz'));
+	like($res->header('Content-Disposition'),
+		qr/filename=no-subject\.mbox\.gz/);
 });
 
 done_testing();