www: stop generating /$MESSAGE_ID/f/ links

[public-inbox.git] / t / view.t

diff --git a/t/view.t b/t/view.t
index 3107285c1dd0dbfb7e4c6cf7a937ca291db23f00..2da741a87931c69e2c9282703829a6b4dc8c8186 100644 (file)
--- 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,25 +41,14 @@ 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=[^>]+>&gt; Long and wordy/,
+       like($html, qr/<a\nid=[^>]+><\/a>&gt; Long and wordy/,
                "long quoted text is anchored");
-
-       # short page
-       my $pfx = "http://example.com/test/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");
-       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
@@ -84,7 +73,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 +102,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,9 +128,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");
 }
 
+{
+       use PublicInbox::MID qw/id_compress/;
+       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');
+}
+
 done_testing();