X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fview.t;h=4ce3c7739018ddf3f5d060471043d729320ef55c;hb=4af9fd9c5e46eed341a535f37d54cf228303326c;hp=2da741a87931c69e2c9282703829a6b4dc8c8186;hpb=e06797ae541b8fcb65030531d854184e7ba2c70d;p=public-inbox.git

diff --git a/t/view.t b/t/view.t
index 2da741a8..4ce3c773 100644
--- a/t/view.t
+++ b/t/view.t
@@ -5,6 +5,30 @@ use warnings;
 use Test::More;
 use Email::MIME;
 use PublicInbox::View;
+use Plack::Util;
+
+# 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 },
+		cloneurl => sub {[]},
+		description => sub { '' }),
+};
+$ctx->{-inbox}->{-primary_address} = 'test@example.com';
+
+sub msg_html ($) {
+	my ($mime) = @_;
+
+	my $s = '';
+	my $body = PublicInbox::View::msg_html($ctx, $mime);
+	while (defined(my $buf = $body->getline)) {
+		$s .= $buf;
+	}
+	$body->close;
+	$s;
+}
 
 # plain text
 {
@@ -41,14 +65,12 @@ 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");
-	like($html, qr/<a\nid=[^>]+><\/a>&gt; Long and wordy/,
-		"long quoted text is anchored");
 }
 
 # multipart crap
@@ -73,8 +95,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
@@ -102,8 +124,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\.patch --!,
 		"parts split with filename");
 }
 
@@ -128,15 +150,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');
 }