From b503d87a23c90fc0f705a79bce34944e7e20b28b Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 10 Feb 2021 18:57:58 -0100 Subject: search: use git approxidate in WWW and "lei q --stdin" This greatly improves the usability of d:, dt:, and rt: search prefixes for users already familiar git's "approxidate" feature. That is, users familiar with the --(since|after|until|before)= options in git-log(1) and similar commands will be able to use those dates in the WWW UI. --- t/psgi_search.t | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 't/psgi_search.t') diff --git a/t/psgi_search.t b/t/psgi_search.t index 8ba431bc..514df005 100644 --- a/t/psgi_search.t +++ b/t/psgi_search.t @@ -74,20 +74,25 @@ 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 = '1.hour.from.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, @_ }; @@ -130,7 +135,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:..1.hour.from.now&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 +156,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); -- cgit v1.2.3-24-ge0c7