X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_search.t;h=3da93eda718cd7335c2b1f747f2a7f16e2bf880e;hb=4bbafbc4bc8869e3f0fb35fdde727b2334fd6b46;hp=514df0050068e80f61a8775dc360f9c37c1fda19;hpb=b503d87a23c90fc0f705a79bce34944e7e20b28b;p=public-inbox.git
diff --git a/t/psgi_search.t b/t/psgi_search.t
index 514df005..3da93eda 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -1,15 +1,13 @@
+#!perl -w
# Copyright (C) 2017-2021 all contributors
# License: AGPL-3.0+
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);
@@ -17,65 +15,54 @@ use_ok($_) for (qw(HTTP::Request::Common Plack::Test));
use_ok 'PublicInbox::WWW';
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(< 'full', tmpdir => "$tmpdir/1", sub {
+ my ($im) = @_;
+ # n.b. these headers are not properly RFC2047-encoded
+ $im->add(PublicInbox::Eml->new(<
From: Ãvar Arnfjörð Bjarmason
To: git\@vger.kernel.org
EOF
-$im->add($mime);
-$im->add(PublicInbox::Eml->new(<<""));
+ $im->add(PublicInbox::Eml->new(<<"")) or BAIL_OUT;
Message-ID:
From: replier
In-Reply-To: <$mid>
Subject: mismatch
-$mime = PublicInbox::Eml->new(<<'EOF');
+ $im->add(PublicInbox::Eml->new(<<'EOF')) or BAIL_OUT;
Subject:
Message-ID:
From: blank subject
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:
From: no subject at all
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(\<{inboxdir}
EOF
my $www = PublicInbox::WWW->new($cfg);
test_psgi(sub { $www->call(@_) }, sub {
my ($cb) = @_;
my ($html, $res);
- my $approxidate = '1.hour.from.now';
+ my $approxidate = 'now';
for my $req ('/test/?q=%C3%86var', '/test/?q=%25C3%2586var') {
$res = $cb->(GET($req."+d:..$approxidate"));
$html = $res->content;
@@ -100,6 +87,10 @@ 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');
is_deeply([], $warn, 'no warnings');
@@ -135,7 +126,7 @@ test_psgi(sub { $www->call(@_) }, sub {
qr/filename=no-subject\.mbox\.gz/);
# "full threads" mbox.gz download
- $res = $cb->(POST('/test/?q=s:test+d:..1.hour.from.now&x=m&t'));
+ $res = $cb->(POST("/test/?q=s:test+d:..$approxidate&x=m&t"));
is($res->code, 200, 'successful mbox download with threads');
gunzip(\($res->content) => \(my $before));
is_deeply([ "Message-ID: <$mid>\n", "Message-ID: \n" ],