X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fview.t;h=2181b5efb34184a1a97bcfae8fa08d9ca0dff431;hb=92f27ed0be327ab6acb61aeedf7a77702cc6c25f;hp=a70c52d8d0549e49cb50f86f7efb22484e986eb1;hpb=21a5cfeb30afef90ca888d425b62651466eed9e3;p=public-inbox.git

diff --git a/t/view.t b/t/view.t
index a70c52d8..2181b5ef 100644
--- a/t/view.t
+++ b/t/view.t
@@ -4,7 +4,46 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-use PublicInbox::View;
+use Plack::Util;
+use_ok 'PublicInbox::View';
+
+my @q = (
+	'foo@bar', 'foo@bar',
+	'a b', "'a b'",
+	"a'b", "'a'\\''b'",
+);
+while (@q) {
+	my $input = shift @q;
+	my $expect = shift @q;
+	my $res = PublicInbox::View::squote_maybe($input);
+	is($res, $expect, "quote $input => $res");
+}
+
+# FIXME: make this test less fragile
+my $ctx = {
+	env => { HTTP_HOST => 'example.com', 'psgi.url_scheme' => 'http' },
+	-inbox => Plack::Util::inline_object(
+		name => 'test',
+		search => sub { undef },
+		base_url => sub { 'http://example.com/' },
+		cloneurl => sub {[]},
+		nntp_url => sub {[]},
+		description => sub { '' }),
+};
+$ctx->{-inbox}->{-primary_address} = 'test@example.com';
+
+sub msg_html ($) {
+	my ($mime) = @_;
+
+	my $s = '';
+	my $r = PublicInbox::View::msg_html($ctx, $mime);
+	my $body = $r->[2];
+	while (defined(my $buf = $body->getline)) {
+		$s .= $buf;
+	}
+	$body->close;
+	$s;
+}
 
 # plain text
 {
@@ -41,7 +80,7 @@ EOF
 		body => $body,
 	)->as_string;
 	my $mime = Email::MIME->new($s);
-	my $html = PublicInbox::View::msg_html(undef, $mime);
+	my $html = msg_html($mime);
 
 	# ghetto tests
 	like($html, qr!<a\nhref="raw"!s, "raw link present");
@@ -71,7 +110,7 @@ EOF
 		parts => $parts,
 	);
 
-	my $html = PublicInbox::View::msg_html(undef, $mime);
+	my $html = msg_html($mime);
 	like($html, qr/hi\n.*-- Attachment #2.*\nbye\n/s, "multipart split");
 }
 
@@ -85,7 +124,7 @@ EOF
 		Email::MIME->create(
 			attributes => {
 				content_type => 'text/plain',
-				filename => "foo.patch",
+				filename => "foo&.patch",
 			},
 			body => "--- a/file\n+++ b/file\n" .
 			        "@@ -49, 7 +49,34 @@\n",
@@ -100,8 +139,8 @@ EOF
 		parts => $parts,
 	);
 
-	my $html = PublicInbox::View::msg_html(undef, $mime);
-	like($html, qr!.*Attachment #2: foo\.patch --!,
+	my $html = msg_html($mime);
+	like($html, qr!.*Attachment #2: foo&(?:amp|#38);\.patch --!,
 		"parts split with filename");
 }
 
@@ -126,7 +165,7 @@ EOF
 	);
 
 	my $orig = $mime->body_raw;
-	my $html = PublicInbox::View::msg_html(undef, $mime);
+	my $html = msg_html($mime);
 	like($orig, qr/hi =3D bye=/, "our test used QP correctly");
 	like($html, qr/\bhi = bye\b/, "HTML output decoded QP");
 }