[PATCH 0/2] subject-free tests and updates

[PATCH 0/2] subject-free tests and updates

[Eric Wong]

Odd cases need more coverage...

Eric Wong (2):
  t/psgi_search: test for subject-free messages
  mboxgz: ensure gzipped mboxes always have filenames

 lib/PublicInbox/MboxGz.pm | 10 ++++------
 t/psgi_search.t           | 39 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 8 deletions(-)

[PATCH 1/2] t/psgi_search: test for subject-free messages

[Eric Wong]

Apparently I fixed this bug a while back in commit
f94c3a195a25a31d0215cd175938008fca473378 but did
not write tests.
---
 t/psgi_search.t | 33 +++++++++++++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/t/psgi_search.t b/t/psgi_search.t
index 5310e5ab..56b42118 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -27,16 +27,32 @@ my $im = $ibx->importer(0);
 my $digits = '10010260936330';
 my $ua = 'Pine.LNX.4.10';
 my $mid = "$ua.$digits.2460-100000\@penguin.transmeta.com";
-my $data = <<"EOF";
+my $mime = PublicInbox::MIME->new(<<EOF);
 Subject: test
 Message-ID: <$mid>
 From: Ævar Arnfjörð Bjarmason <avarab\@example>
 To: git\@vger.kernel.org
 
 EOF
+$im->add($mime);
+
+$mime = PublicInbox::MIME->new(<<'EOF');
+Subject:
+Message-ID: <blank-subject@example.com>
+From: blank subject <blank-subject@example.com>
+To: git@vger.kernel.org
+
+EOF
+$im->add($mime);
 
-my $mime = Email::MIME->new(\$data);
+$mime = PublicInbox::MIME->new(<<'EOF');
+Message-ID: <no-subject-at-all@example.com>
+From: no subject at all <no-subject-at-all@example.com>
+To: git@vger.kernel.org
+
+EOF
 $im->add($mime);
+
 $im->done;
 PublicInbox::SearchIdx->new($ibx, 1)->index_sync;
 
@@ -78,6 +94,19 @@ test_psgi(sub { $www->call(@_) }, sub {
 		like($res->content, $mid_re, 'found mid in response');
 		chop($digits);
 	}
+
+	$res = $cb->(GET('/test/'));
+	$html = $res->content;
+	like($html, qr/\bhref="no-subject-at-all[^>]+>\(no subject\)</,
+		'subject-less message linked from "/$INBOX/"');
+	like($html, qr/\bhref="blank-subject[^>]+>\(no subject\)</,
+		'blank subject message linked from "/$INBOX/"');
+
+	$res = $cb->(GET('/test/?q=tc:git'));
+	like($html, qr/\bhref="no-subject-at-all[^>]+>\(no subject\)</,
+		'subject-less message linked from "/$INBOX/?q=..."');
+	like($html, qr/\bhref="blank-subject[^>]+>\(no subject\)</,
+		'blank subject message linked from "/$INBOX/?q=..."');
 });
 
 done_testing();

[PATCH 2/2] mboxgz: ensure gzipped mboxes always have filenames

[Eric Wong]

Lets always have Content-Disposition for files intended
to be downloaded for consumption by non-browsers, such
as pigz, zcat, "git am".

This is also to be consistent with the non-gzipped mbox
$MESSAGE_ID/raw endpoint.
---
 lib/PublicInbox/MboxGz.pm | 10 ++++------
 t/psgi_search.t           |  6 ++++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/PublicInbox/MboxGz.pm b/lib/PublicInbox/MboxGz.pm
index 08e3c846..30074e4d 100644
--- a/lib/PublicInbox/MboxGz.pm
+++ b/lib/PublicInbox/MboxGz.pm
@@ -21,12 +21,10 @@ sub response {
 	my ($class, $ctx, $cb, $fn) = @_;
 	my $body = $class->new($ctx, $cb);
 	# http://www.iana.org/assignments/media-types/application/gzip
-	my @h = qw(Content-Type application/gzip);
-	if (defined $fn && $fn ne '') {
-		$fn = to_filename($fn);
-		push @h, 'Content-Disposition', "inline; filename=$fn.mbox.gz";
-	}
-	[ 200, \@h, $body ];
+	$fn = defined($fn) && $fn ne '' ? to_filename($fn) : 'no-subject';
+	my $h = [ qw(Content-Type application/gzip),
+		'Content-Disposition', "inline; filename=$fn.mbox.gz" ];
+	[ 200, $h, $body ];
 }
 
 sub gzip_fail ($$) {
diff --git a/t/psgi_search.t b/t/psgi_search.t
index 56b42118..4ff25eb2 100644
--- a/t/psgi_search.t
+++ b/t/psgi_search.t
@@ -107,6 +107,12 @@ test_psgi(sub { $www->call(@_) }, sub {
 		'subject-less message linked from "/$INBOX/?q=..."');
 	like($html, qr/\bhref="blank-subject[^>]+>\(no subject\)</,
 		'blank subject message linked from "/$INBOX/?q=..."');
+	$res = $cb->(GET('/test/no-subject-at-all@example.com/raw'));
+	like($res->header('Content-Disposition'),
+		qr/filename=no-subject\.txt/);
+	$res = $cb->(GET('/test/no-subject-at-all@example.com/t.mbox.gz'));
+	like($res->header('Content-Disposition'),
+		qr/filename=no-subject\.mbox\.gz/);
 });
 
 done_testing();