Merge remote-tracking branch 'origin/newspeak' into xcpdb

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

diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 65448dc435a3d9925942233c60f4fd98e3243d72..a84566d923e788883c71818dd4b914fa19c83e91 100644 (file)
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -3,6 +3,8 @@
 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;
@@ -153,7 +155,7 @@ test_psgi(sub { $www->call(@_) }, sub {
        $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<//s, 'got all results');
+       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');
 
@@ -200,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)) {