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

diff --git a/t/view.t b/t/view.t
index ca456aab..325f509c 100644
--- a/t/view.t
+++ b/t/view.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2013, Eric Wong <normalperson@yhbt.net> and all contributors
+# Copyright (C) 2013-2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 use strict;
 use warnings;
@@ -41,20 +41,21 @@ EOF
 		body => $body,
 	)->as_string;
 	my $mime = Email::MIME->new($s);
-	my $html = PublicInbox::View->msg_html($mime);
+	my $html = PublicInbox::View::msg_html(undef, $mime);
 
 	# ghetto tests
-	like($html, qr!<a\nhref="\.\./m/hello%40!s, "MID 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 = "http://example.com/test/f";
+	my $pfx = "../hello%40example.com/f/";
 	$mime = Email::MIME->new($s);
-	my $short = PublicInbox::View->msg_html($mime, $pfx);
-	like($short, qr!<a\nhref="hello%40!s, "MID link present");
+	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/,
@@ -84,7 +85,7 @@ EOF
 		parts => $parts,
 	);
 
-	my $html = PublicInbox::View->msg_html($mime);
+	my $html = PublicInbox::View::msg_html(undef, $mime);
 	like($html, qr/hi\n-+ part #2 -+\nbye\n/, "multipart split");
 }
 
@@ -113,7 +114,7 @@ EOF
 		parts => $parts,
 	);
 
-	my $html = PublicInbox::View->msg_html($mime);
+	my $html = PublicInbox::View::msg_html(undef, $mime);
 	like($html, qr!see attached patch\n-+ foo\.patch -+\n--- a/file\n!,
 		"parts split with filename");
 }
@@ -139,17 +140,17 @@ EOF
 	);
 
 	my $orig = $mime->body_raw;
-	my $html = PublicInbox::View->msg_html($mime);
+	my $html = PublicInbox::View::msg_html(undef, $mime);
 	like($orig, qr/hi =3D bye=/, "our test used QP correctly");
 	like($html, qr/\bhi = bye\b/, "HTML output decoded QP");
 }
 
 
 {	# XXX dirty hack
-	use PublicInbox::MID qw/mid_compressed/;
-	like(mid_compressed('foo%bar@wtf'), qr/\A[a-f0-9]{40}\z/,
+	use PublicInbox::MID qw/mid_compress/;
+	like(mid_compress('foo%bar@wtf'), qr/\A[a-f0-9]{40}\z/,
 		"percent always converted to sha1 to workaround buggy httpds");
-	is(mid_compressed('foobar@wtf'), 'foobar@wtf',
+	is(mid_compress('foobar@wtf'), 'foobar@wtf',
 		'regular MID not compressed');
 }