X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=cb5ece638b1d79f334ab96f90ff30ba7585f62d9;hb=1bbfab375438f149dcff9047dd0c5ed3a08eed53;hp=aa3279cc6870743e43f62efb4b8f98141d4a7193;hpb=0dceebd0a85774c92af247e6da5e2f5a0ee8417c;p=public-inbox.git
diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index aa3279cc..cb5ece63 100644
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -1,8 +1,10 @@
-# Copyright (C) 2018 all contributors
+# Copyright (C) 2018-2019 all contributors
# License: AGPL-3.0+
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;
@@ -16,9 +18,9 @@ foreach my $mod (@mods) {
}
use_ok($_) for @mods;
use_ok 'PublicInbox::V2Writable';
-my $mainrepo = tempdir('pi-v2_dupes-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my $inboxdir = tempdir('pi-v2_dupes-XXXXXX', TMPDIR => 1, CLEANUP => 1);
my $ibx = {
- mainrepo => $mainrepo,
+ inboxdir => $inboxdir,
name => 'test-v2writable',
version => 2,
-primary_address => 'test@example.com',
@@ -52,11 +54,11 @@ $new_mid = $mids->[1];
$im->done;
my $cfgpfx = "publicinbox.v2test";
-my $cfg = {
- "$cfgpfx.address" => $ibx->{-primary_address},
- "$cfgpfx.mainrepo" => $mainrepo,
-};
-my $config = PublicInbox::Config->new($cfg);
+my $cfg = <{-primary_address}
+$cfgpfx.inboxdir=$inboxdir
+EOF
+my $config = PublicInbox::Config->new(\$cfg);
my $www = PublicInbox::WWW->new($config);
my ($res, $raw, @from_);
test_psgi(sub { $www->call(@_) }, sub {
@@ -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 };
@@ -149,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, [ '(GET('/v2test/a-mid@b/'));
$raw = $res->content;
@@ -182,6 +192,9 @@ 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/');
+ @over = ($raw =~ m/^\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
+ is_deeply(\@over, [ '(GET('/v2test/reuse@mid/t/'));
$raw = $res->content;
@@ -189,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)) {