X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fpsgi_v2.t;h=faa139fb7aa2a64ae0405d5124071ce271e995b7;hb=fad9acd35e56a289ade90a62d056b2a6663d448c;hp=11b2c794e238634c66dac443d60b64d1e717a817;hpb=9aaf9cf73f7b126ad3d2726adf7c764630626d67;p=public-inbox.git

diff --git a/t/psgi_v2.t b/t/psgi_v2.t
index 11b2c794..faa139fb 100644
--- a/t/psgi_v2.t
+++ b/t/psgi_v2.t
@@ -125,8 +125,29 @@ test_psgi(sub { $www->call(@_) }, sub {
 		like($out, qr/^hello world$/m, 'got first in t.mbox.gz');
 		like($out, qr/^hello world!$/m, 'got second in t.mbox.gz');
 		like($out, qr/^hello ghosts$/m, 'got third in t.mbox.gz');
-		@from_ = ($raw =~ m/^From /mg);
+		@from_ = ($out =~ m/^From /mg);
 		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);
+		like($out, qr/^hello world$/m, 'got first in mbox POST');
+		like($out, qr/^hello world!$/m, 'got second in mbox POST');
+		like($out, qr/^hello ghosts$/m, 'got third in mbox POST');
+		@from_ = ($out =~ m/^From /mg);
+		is(scalar(@from_), 3, 'three From_ lines in mbox POST');
+
+		# all.mbox.gz interface
+		$res = $cb->(GET('/v2test/all.mbox.gz'));
+		$in = $res->content;
+		$status = IO::Uncompress::Gunzip::gunzip(\$in => \$out);
+		like($out, qr/^hello world$/m, 'got first in all.mbox');
+		like($out, qr/^hello world!$/m, 'got second in all.mbox');
+		like($out, qr/^hello ghosts$/m, 'got third in all.mbox');
+		@from_ = ($out =~ m/^From /mg);
+		is(scalar(@from_), 3, 'three From_ lines in all.mbox');
 	};
 
 	local $SIG{__WARN__} = 'DEFAULT';
@@ -162,6 +183,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/');
+	my @over = ($raw =~ m/^\d{4}-\d+-\d+\s+\d+:\d+ (.+)$/gm);
+	is_deeply(\@over, [ '<a', '` <a', '` <a', '` <a' ],
+		'duplicate messages share the same root');
 
 	$res = $cb->(GET('/v2test/reuse@mid/t/'));
 	$raw = $res->content;
@@ -171,6 +195,42 @@ test_psgi(sub { $www->call(@_) }, sub {
 	is($res->code, 200, 'got info refs for dumb clones');
 	$res = $cb->(GET('/v2test/info/refs'));
 	is($res->code, 404, 'unpartitioned git URL fails');
+
+	# ensure conflicted attachments can be resolved
+	foreach my $body (qw(old new)) {
+		my $parts = [
+			PublicInbox::MIME->create(
+				attributes => { content_type => 'text/plain' },
+				body => 'blah',
+			),
+			PublicInbox::MIME->create(
+				attributes => {
+					filename => 'attach.txt',
+					content_type => 'text/plain',
+				},
+				body => $body
+			)
+		];
+		$mime = PublicInbox::MIME->create(
+			parts => $parts,
+			header_str => [ From => 'root@z',
+				'Message-ID' => '<a@dup>',
+				Subject => 'hi']
+		);
+		ok($im->add($mime), "added attachment $body");
+	}
+	$im->done;
+	$config->each_inbox(sub { $_[0]->search->reopen });
+	$res = $cb->(GET('/v2test/a@dup/'));
+	my @links = ($res->content =~ m!"\.\./([^/]+/2-attach\.txt)\"!g);
+	is(scalar(@links), 2, 'both attachment links exist');
+	isnt($links[0], $links[1], 'attachment links are different');
+	{
+		my $old = $cb->(GET('/v2test/' . $links[0]));
+		my $new = $cb->(GET('/v2test/' . $links[1]));
+		is($old->content, 'old', 'got expected old content');
+		is($new->content, 'new', 'got expected new content');
+	}
 });
 
 done_testing();