diff options
Diffstat (limited to 't')
| -rw-r--r-- | t/lei-externals.t | 2 | ||||
| -rw-r--r-- | t/psgi_search.t | 37 | ||||
| -rw-r--r-- | t/search.t | 25 |
3 files changed, 47 insertions, 17 deletions
diff --git a/t/lei-externals.t b/t/lei-externals.t index 9fc8bae9..f61b7e52 100644 --- a/t/lei-externals.t +++ b/t/lei-externals.t @@ -151,7 +151,7 @@ SKIP: { { open my $fh, '+>', undef or BAIL_OUT $!; $fh->autoflush(1); - print $fh 's:use' or BAIL_OUT $!; + print $fh 's:use d:..5.days.from.now' or BAIL_OUT $!; seek($fh, 0, SEEK_SET) or BAIL_OUT $!; ok($lei->([qw(q -q --stdin)], undef, { %$lei_opt, 0 => $fh }), '--stdin on regular file works'); 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/<title>Æ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); @@ -583,6 +583,31 @@ SKIP: { $q = $s->query_argv_to_string($g, [qw{OR (rt:1993-10-02)}]); like($q, qr/\AOR \(rt:749\d{6}\.\.749\d{6}\)\z/, 'trailing parentheses preserved'); + + my $qs = qq[f:bob rt:1993-10-02..2010-10-02]; + $s->query_approxidate($g, $qs); + like($qs, qr/\Af:bob rt:749\d{6}\.\.128\d{7}\z/, + 'no phrases, no problem'); + + my $orig = $qs = qq[f:bob "d:1993-10-02..2010-10-02"]; + $s->query_approxidate($g, $qs); + is($qs, $orig, 'phrase preserved'); + + $orig = $qs = qq[f:bob "d:1993-10-02..2010-10-02 "] . + qq["dt:1993-10-02..2010-10-02 " \x{201c}]; + $s->query_approxidate($g, $qs); + is($qs, $orig, 'phrase preserved even with escaped ""'); + + $orig = $qs = qq[f:bob "hello world" d:1993-10-02..2010-10-02]; + $s->query_approxidate($g, $qs); + is($qs, qq[f:bob "hello world" d:19931002..20101002], + 'post-phrase date corrected'); + + my $x_days_ago = strftime('%Y%m%d', gmtime(time - (5 * 86400))); + $orig = $qs = qq[broken d:5.days.ago..]; + $s->query_approxidate($g, $qs); + is($qs, qq[broken d:$x_days_ago..], 'date.phrase.with.dots'); + $ENV{TEST_EXPENSIVE} or skip 'TEST_EXPENSIVE not set for argv overflow check', 1; my @w; |