X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fview.t;h=1f4ed9373a8857a385cea3a84b78c3226325c0dd;hb=ef3ca9b80fcb464d851c2f8d87f3f02f4f70986d;hp=1f464762644b97e943477efe8410da970e9c0f78;hpb=f2b5ddcbd897457f02be456460e8793a88481332;p=public-inbox.git

diff --git a/t/view.t b/t/view.t
index 1f464762..1f4ed937 100644
--- a/t/view.t
+++ b/t/view.t
@@ -4,7 +4,34 @@ use strict;
 use warnings;
 use Test::More;
 use Email::MIME;
-use PublicInbox::View;
+use Plack::Util;
+use_ok 'PublicInbox::View';
+
+# 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,10 +68,10 @@ 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");
+	like($html, qr!<a\nhref="raw"!s, "raw link present");
 	like($html, qr/hello world\b/, "body present");
 	like($html, qr/&gt; keep this inline/, "short quoted text is inline");
 }
@@ -71,8 +98,8 @@ EOF
 		parts => $parts,
 	);
 
-	my $html = PublicInbox::View::msg_html(undef, $mime);
-	like($html, qr/hi\n-+ part #2 -+\nbye\n/, "multipart split");
+	my $html = msg_html($mime);
+	like($html, qr/hi\n.*-- Attachment #2.*\nbye\n/s, "multipart split");
 }
 
 # multipart email with attached patch
@@ -85,7 +112,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 +127,8 @@ EOF
 		parts => $parts,
 	);
 
-	my $html = PublicInbox::View::msg_html(undef, $mime);
-	like($html, qr!see attached patch\n-+ foo\.patch -+\n--- a/file\n!,
+	my $html = msg_html($mime);
+	like($html, qr!.*Attachment #2: foo&(?:amp|#38);\.patch --!,
 		"parts split with filename");
 }
 
@@ -126,15 +153,18 @@ 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");
 }
 
 {
 	use PublicInbox::MID qw/id_compress/;
+
+	# n.b: this is probably invalid since we dropped CGI for PSGI:
 	like(id_compress('foo%bar@wtf'), qr/\A[a-f0-9]{40}\z/,
 		"percent always converted to sha1 to workaround buggy httpds");
+
 	is(id_compress('foobar-wtf'), 'foobar-wtf',
 		'regular ID not compressed');
 }