X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=t%2Fpsgi_search.t;h=3da93eda718cd7335c2b1f747f2a7f16e2bf880e;hp=8ba431bcae7c92c90f6ab14fbc8d34558f7cffa7;hb=4eee5af6011cc8cdefb66c9729952c7eff5c0b0b;hpb=9dfc0b670fc634b54998c3020f173b82de1915ac diff --git a/t/psgi_search.t b/t/psgi_search.t index 8ba431bc..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,77 +15,71 @@ 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 $res; - $res = $cb->(GET('/test/?q=%C3%86var')); - my $html = $res->content; - like($html, qr/Ævar - /, 'HTML escaped in title'); - my @res = ($html =~ m/\?q=(.+var)\b/g); - ok(scalar(@res), 'saw query strings'); - my %uniq = map { $_ => 1 } @res; - is(1, scalar keys %uniq, 'all query values identical in HTML'); - is('%C3%86var', (keys %uniq)[0], 'matches original query'); - ok(index($html, 'by Ævar Arnfjörð Bjarmason') >= 0, - "displayed Ævar's name properly in HTML"); - - like($html, qr/download mbox\.gz: .*?"full threads"/s, - '"full threads" download option shown'); + my ($html, $res); + my $approxidate = 'now'; + for my $req ('/test/?q=%C3%86var', '/test/?q=%25C3%2586var') { + $res = $cb->(GET($req."+d:..$approxidate")); + $html = $res->content; + like($html, qr/<title>Ævar d:\.\.\Q$approxidate\E/, + 'HTML escaped in title, "d:..$APPROXIDATE" preserved'); + my @res = ($html =~ m/\?q=(.+var)\+d:\.\.\Q$approxidate\E/g); + ok(scalar(@res), 'saw query strings'); + my %uniq = map { $_ => 1 } @res; + is(1, scalar keys %uniq, 'all query values identical in HTML'); + is('%C3%86var', (keys %uniq)[0], 'matches original query'); + ok(index($html, 'by Ævar Arnfjörð Bjarmason') + >= 0, "displayed Ævar's name properly in HTML"); + like($html, qr/download mbox\.gz: .*?"full threads"/s, + '"full threads" download option shown'); + } + like($html, qr/Initial query\b.*?returned no.results, used:.*instead/s, + 'noted retry on double-escaped query {-uxs_retried}'); my $warn = []; local $SIG{__WARN__} = sub { push @$warn, @_ }; @@ -95,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'); @@ -130,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&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: <reply\@asdf>\n" ], @@ -151,7 +147,7 @@ test_psgi(sub { $www->call(@_) }, sub { '"full threads" download option not shown w/o has_threadid'); # in case somebody uses curl to bypass <form> - $res = $cb->(POST('/test/?q=s:test&x=m&t')); + $res = $cb->(POST("/test/?q=s:test+d:..$approxidate&x=m&t")); is($res->code, 200, 'successful mbox download w/ threads'); gunzip(\($res->content) => \(my $after)); isnt($before, $after);