X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fview.t;h=6c0859915e89c9ae2d1384d69c2bd35a5c8d5ed0;hb=31afda256c813443062e0504213d41732e50ee45;hp=325f509c0660e83d6f7c03a81809fd3b6552c13b;hpb=f76f265a851944b5dedcc3be5f3b5224b6ebda89;p=public-inbox.git

diff --git a/t/view.t b/t/view.t
index 325f509c..6c085991 100644
--- a/t/view.t
+++ b/t/view.t
@@ -6,6 +6,18 @@ use Test::More;
 use Email::MIME;
 use PublicInbox::View;
 
+sub msg_html ($) {
+	my ($mime) = @_;
+
+	my $s = '';
+	my $body = PublicInbox::View::msg_html(undef, $mime);
+	while (defined(my $buf = $body->getline)) {
+		$s .= $buf;
+	}
+	$body->close;
+	$s;
+}
+
 # plain text
 {
 	my $body = <<EOF;
@@ -41,26 +53,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");
-
-	# short page
-	my $pfx = "../hello%40example.com/f/";
-	$mime = Email::MIME->new($s);
-	my $short = PublicInbox::View::msg_html(undef, $mime, $pfx);
-	like($short, qr!<a\nhref="\.\./hello%40example\.com/f/!s,
-		"MID link present");
-	like($short, qr/\n&gt; keep this inline/,
-		"short quoted text is inline");
-	like($short, qr/<a\nhref="\Q$pfx\E#[^>]+>Long and wordy/,
-		"long quoted text is made into a link");
-	ok(length($short) < length($html), "short page is shorter");
 }
 
 # multipart crap
@@ -85,8 +83,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
@@ -114,8 +112,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");
 }
 
@@ -140,18 +138,20 @@ 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/;
 
-{	# XXX dirty hack
-	use PublicInbox::MID qw/mid_compress/;
-	like(mid_compress('foo%bar@wtf'), qr/\A[a-f0-9]{40}\z/,
+	# 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(mid_compress('foobar@wtf'), 'foobar@wtf',
-		'regular MID not compressed');
+
+	is(id_compress('foobar-wtf'), 'foobar-wtf',
+		'regular ID not compressed');
 }
 
 done_testing();