run update-copyrights from gnulib for 2019

[public-inbox.git] / t / psgi_v2.t

diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index faa139fb7aa2a64ae0405d5124071ce271e995b7..3003c5d62a7cb1397462cb0b45461eb0f7eee829 100644 (file)
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -1,8 +1,10 @@
-# Copyright (C) 2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2018-2019 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;
+require './t/common.perl';
+require_git(2.6);
 use File::Temp qw/tempdir/;
 use PublicInbox::MIME;
 use PublicInbox::Config;
@@ -113,6 +115,7 @@ test_psgi(sub { $www->call(@_) }, sub {
        like($raw, qr/^hello ghosts$/m, 'got third message');
        @from_ = ($raw =~ m/^From /mg);
        is(scalar(@from_), 3, 'three From_ lines');
+       $config->each_inbox(sub { $_[0]->search->reopen });
 
        SKIP: {
                eval { require IO::Uncompress::Gunzip };
@@ -129,7 +132,6 @@ test_psgi(sub { $www->call(@_) }, sub {
                is(scalar(@from_), 3, 'three From_ lines in t.mbox.gz');
 
                # search interface
-               $config->each_inbox(sub { $_[0]->search->reopen });
                $res = $cb->(POST('/v2test/?q=m:a-mid@b&x=m'));
                $in = $res->content;
                $status = IO::Uncompress::Gunzip::gunzip(\$in => \$out);
@@ -150,6 +152,13 @@ test_psgi(sub { $www->call(@_) }, sub {
                is(scalar(@from_), 3, 'three From_ lines in all.mbox');
        };
 
+       $res = $cb->(GET('/v2test/?q=m:a-mid@b&x=t'));
+       is($res->code, 200, 'success with threaded search');
+       my $raw = $res->content;
+       ok($raw =~ s/\A.*>Results 1-3 of 3\b//s, 'got all results');
+       my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
+       is_deeply(\@over, [ '<a', '` <a', '` <a' ], 'threaded messages show up');
+
        local $SIG{__WARN__} = 'DEFAULT';
        $res = $cb->(GET('/v2test/a-mid@b/'));
        $raw = $res->content;
@@ -183,7 +192,7 @@ test_psgi(sub { $www->call(@_) }, sub {
        $res = $cb->(GET('/v2test/reuse@mid/T/'));
        $raw = $res->content;
        like($raw, qr/\b4\+ messages\b/, 'thread overview shown with /T/');
-       my @over = ($raw =~ m/^\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
+       @over = ($raw =~ m/^\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
        is_deeply(\@over, [ '<a', '` <a', '` <a', '` <a' ],
                'duplicate messages share the same root');
 
@@ -193,8 +202,10 @@ test_psgi(sub { $www->call(@_) }, sub {
 
        $res = $cb->(GET('/v2test/0/info/refs'));
        is($res->code, 200, 'got info refs for dumb clones');
+       $res = $cb->(GET('/v2test/0.git/info/refs'));
+       is($res->code, 200, 'got info refs for dumb clones w/ .git suffix');
        $res = $cb->(GET('/v2test/info/refs'));
-       is($res->code, 404, 'unpartitioned git URL fails');
+       is($res->code, 404, 'v2 git URL w/o shard fails');
 
        # ensure conflicted attachments can be resolved
        foreach my $body (qw(old new)) {