X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=fdd6969f8034322a4e2fcffde8e5627e6d164c7d;hb=bf4d35dd2f6389e9aa4dc87fdfaef801fa5b9108;hp=360106890047e25fb8fe7bd3cd9df3e894d9eec8;hpb=2e0abeb5e0e2ffa55ffef650f91f50086f143019;p=public-inbox.git

diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 36010689..fdd6969f 100644
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -1,26 +1,21 @@
-# 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';
+use PublicInbox::TestCommon;
 require_git(2.6);
-use File::Temp qw/tempdir/;
 use PublicInbox::MIME;
 use PublicInbox::Config;
-use PublicInbox::WWW;
 use PublicInbox::MID qw(mids);
-my @mods = qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
-		URI::Escape Plack::Builder);
-foreach my $mod (@mods) {
-	eval "require $mod";
-	plan skip_all => "$mod missing for psgi_v2_dupes.t" if $@;
-}
-use_ok($_) for @mods;
+require_mods(qw(DBD::SQLite Search::Xapian HTTP::Request::Common Plack::Test
+		URI::Escape Plack::Builder));
+use_ok($_) for (qw(HTTP::Request::Common Plack::Test));
+use_ok 'PublicInbox::WWW';
 use_ok 'PublicInbox::V2Writable';
-my $mainrepo = tempdir('pi-v2_dupes-XXXXXX', TMPDIR => 1, CLEANUP => 1);
+my ($inboxdir, $for_destroy) = tmpdir();
 my $ibx = {
-	mainrepo => $mainrepo,
+	inboxdir => $inboxdir,
 	name => 'test-v2writable',
 	version => 2,
 	-primary_address => 'test@example.com',
@@ -54,15 +49,18 @@ $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 = <<EOF;
+$cfgpfx.address=$ibx->{-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 {
 	my ($cb) = @_;
+	$res = $cb->(GET('/v2test/description'));
+	like($res->content, qr!\$INBOX_DIR/description missing!,
+		'got v2 description missing message');
 	$res = $cb->(GET('/v2test/a-mid@b/raw'));
 	$raw = $res->content;
 	like($raw, qr/^hello world$/m, 'got first message');
@@ -155,10 +153,20 @@ 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');
-	my @over = ($raw =~ m/\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
+	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+ +(?:\d+\% )?(.+)$/gm);
 	is_deeply(\@over, [ '<a', '` <a', '` <a' ], 'threaded messages show up');
 
+	$res = $cb->(GET('/v2test/?q=m:a-mid@b&x=A'));
+	is($res->code, 200, 'success with Atom search');
+	SKIP: {
+		require_mods(qw(XML::Feed), 2);
+		$raw = $res->content;
+		my $p = XML::Feed->parse(\$raw);
+		is($p->format, "Atom", "parsed atom feed");
+		is(scalar $p->entries, 3, "parsed three entries");
+	};
+
 	local $SIG{__WARN__} = 'DEFAULT';
 	$res = $cb->(GET('/v2test/a-mid@b/'));
 	$raw = $res->content;
@@ -168,7 +176,7 @@ test_psgi(sub { $www->call(@_) }, sub {
 	@from_ = ($raw =~ m/>From: /mg);
 	is(scalar(@from_), 3, 'three From: lines');
 	foreach my $mid ('a-mid@b', $new_mid, $third) {
-		like($raw, qr/&lt;\Q$mid\E&gt;/s, "Message-ID $mid shown");
+		like($raw, qr!>\Q$mid\E</a>!s, "Message-ID $mid shown");
 	}
 	like($raw, qr/\b3\+ messages\b/, 'thread overview shown');