X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=9964b47762abce93e83d3749340e5c798d1c89f5;hb=7b5ea579e6a9490a4a38958acac8e078d805eec7;hp=738979855cf325bf4f117c193767dee5e066f24d;hpb=0f5b6cfca5c040162ff06ee1185eb6e4bad4b69c;p=public-inbox.git

diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 73897985..9964b477 100644
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -78,6 +78,12 @@ test_psgi(sub { $www->call(@_) }, sub {
 	my @bodies = ($res->content =~ />(hello [^<]+)</mg);
 	is_deeply(\@bodies, [ "hello world!\n", "hello world\n" ],
 		'Atom ordering is chronological');
+
+	# new.html should sort by Date:, too (if Received is missing)
+	$res = $cb->(GET('/v2test/new.html'));
+	@bodies = ($res->content =~ /^(hello [^<]+)$/mg);
+	is_deeply(\@bodies, [ "hello world!\n", "hello world\n" ],
+		'new.html ordering is chronological');
 });
 
 $mime->header_set('Message-Id', 'a-mid@b');
@@ -121,6 +127,49 @@ test_psgi(sub { $www->call(@_) }, sub {
 		@from_ = ($raw =~ m/^From /mg);
 		is(scalar(@from_), 3, 'three From_ lines in t.mbox.gz');
 	};
+
+	local $SIG{__WARN__} = 'DEFAULT';
+	$res = $cb->(GET('/v2test/a-mid@b/'));
+	$raw = $res->content;
+	like($raw, qr/^hello world$/m, 'got first message');
+	like($raw, qr/^hello world!$/m, 'got second message');
+	like($raw, qr/^hello ghosts$/m, 'got third message');
+	@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/\b3\+ messages\b/, 'thread overview shown');
+
+	my $exp = [ qw(<a-mid@b> <reuse@mid>) ];
+	$mime->header_set('Message-Id', @$exp);
+	$mime->header_set('Subject', '4th dupe');
+	local $SIG{__WARN__} = sub {};
+	ok($im->add($mime), 'added one message');
+	$im->done;
+	my @h = $mime->header('Message-ID');
+	is_deeply($exp, \@h, 'reused existing Message-ID');
+
+	$config->each_inbox(sub { $_[0]->search->reopen });
+
+	$res = $cb->(GET('/v2test/new.atom'));
+	my @ids = ($res->content =~ m!<id>urn:uuid:([^<]+)</id>!sg);
+	my %ids;
+	$ids{$_}++ for @ids;
+	is_deeply([qw(1 1 1 1)], [values %ids], 'feed ids unique');
+
+	$res = $cb->(GET('/v2test/reuse@mid/T/'));
+	$raw = $res->content;
+	like($raw, qr/\b4\+ messages\b/, 'thread overview shown with /T/');
+
+	$res = $cb->(GET('/v2test/reuse@mid/t/'));
+	$raw = $res->content;
+	like($raw, qr/\b4\+ messages\b/, 'thread overview shown with /t/');
+
+	$res = $cb->(GET('/v2test/0/info/refs'));
+	is($res->code, 200, 'got info refs for dumb clones');
+	$res = $cb->(GET('/v2test/info/refs'));
+	is($res->code, 404, 'unpartitioned git URL fails');
 });
 
 done_testing();