diff options
| author | Eric Wong <e@80x24.org> | 2015-08-27 04:34:01 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2015-08-27 06:04:51 +0000 |
| commit | 9a2931759c3dcbd879728b49151aa3f8a641b506 (patch) | |
| tree | 001d6823d7d9d143d3494ad8376d624ea1ca6afc /t | |
| parent | e3c3cde22f57bf16bc47c50d8f9ac02416975cd3 (diff) | |
| download | public-inbox-9a2931759c3dcbd879728b49151aa3f8a641b506.tar.gz | |
These URLs are preferable in case somebody decides to get cute and use a suffix we would've used to prevent others from linking to their message. The common /m/$MESSAGE_ID/ URLs are now 4 characters shorter so may fit better on terminals.
Diffstat (limited to 't')
| -rw-r--r-- | t/cgi.t | 28 | ||||
| -rw-r--r-- | t/feed.t | 2 | ||||
| -rw-r--r-- | t/plack.t | 4 | ||||
| -rw-r--r-- | t/view.t | 7 |
4 files changed, 21 insertions, 20 deletions
@@ -152,27 +152,27 @@ EOF } local $ENV{GIT_DIR} = $maindir; - my $res = cgi_run("/test/m/slashy%2fasdf%40example.com.txt"); + my $res = cgi_run("/test/m/slashy%2fasdf%40example.com/raw"); like($res->{body}, qr/Message-Id: <\Q$slashy_mid\E>/, - "slashy mid.txt hit"); + "slashy mid raw hit"); - $res = cgi_run("/test/m/blahblah\@example.com.txt"); + $res = cgi_run("/test/m/blahblah\@example.com/raw"); like($res->{body}, qr/Message-Id: <blahblah\@example\.com>/, - "mid.txt hit"); - $res = cgi_run("/test/m/blahblah\@example.con.txt"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.txt miss"); + "mid raw hit"); + $res = cgi_run("/test/m/blahblah\@example.con/raw"); + like($res->{head}, qr/Status: 404 Not Found/, "mid raw miss"); - $res = cgi_run("/test/m/blahblah\@example.com.html"); - like($res->{body}, qr/\A<html>/, "mid.html hit"); + $res = cgi_run("/test/m/blahblah\@example.com/"); + like($res->{body}, qr/\A<html>/, "mid html hit"); like($res->{head}, qr/Status: 200 OK/, "200 response"); - $res = cgi_run("/test/m/blahblah\@example.con.html"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.html miss"); + $res = cgi_run("/test/m/blahblah\@example.con/"); + like($res->{head}, qr/Status: 404 Not Found/, "mid html miss"); - $res = cgi_run("/test/f/blahblah\@example.com.html"); - like($res->{body}, qr/\A<html>/, "mid.html hit"); + $res = cgi_run("/test/f/blahblah\@example.com/"); + like($res->{body}, qr/\A<html>/, "mid html"); like($res->{head}, qr/Status: 200 OK/, "200 response"); - $res = cgi_run("/test/f/blahblah\@example.con.html"); - like($res->{head}, qr/Status: 404 Not Found/, "mid.html miss"); + $res = cgi_run("/test/f/blahblah\@example.con/"); + like($res->{head}, qr/Status: 404 Not Found/, "mid html miss"); $res = cgi_run("/test/"); like($res->{body}, qr/slashy%2Fasdf%40example\.com/, @@ -77,7 +77,7 @@ EOF } unlike($feed, qr/drop me/, "long quoted text dropped"); - like($feed, qr!/f/\d%40example\.com\.html\b!, + like($feed, qr!/f/\d%40example\.com/#q!, "/f/ url generated for long quoted text"); like($feed, qr/inline me here/, "short quoted text kept"); like($feed, qr/keep me/, "unquoted text saved"); @@ -88,7 +88,7 @@ EOF is(200, $res->code, 'success response received'); like($res->content, qr!href="\Q$atomurl\E"!, 'atom URL generated'); - like($res->content, qr!href="m/blah%40example\.com\.html"!, + like($res->content, qr!href="m/blah%40example\.com/"!, 'index generated'); }); @@ -98,7 +98,7 @@ EOF my $res = $cb->(GET($pfx . '/atom.xml')); is(200, $res->code, 'success response received for atom'); like($res->content, - qr!link\s+href="\Q$pfx\E/m/blah%40example\.com\.html"!s, + qr!link\s+href="\Q$pfx\E/m/blah%40example\.com/"!s, 'atom feed generated correct URL'); }); @@ -44,17 +44,18 @@ EOF 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="\.\./\.\./m/hello%40!s, "MID link present"); like($html, qr/hello world\b/, "body present"); like($html, qr/> keep this inline/, "short quoted text is inline"); like($html, qr/<a\nid=[^>]+><\/a>> Long and wordy/, "long quoted text is anchored"); # short page - my $pfx = "http://example.com/test/f"; + my $pfx = "../../f/hello%40example.com/"; $mime = Email::MIME->new($s); my $short = PublicInbox::View::msg_html(undef, $mime, $pfx); - like($short, qr!<a\nhref="hello%40!s, "MID link present"); + like($short, qr!<a\nhref="\.\./\.\./f/hello%40example\.com/!s, + "MID link present"); like($short, qr/\n> keep this inline/, "short quoted text is inline"); like($short, qr/<a\nhref="\Q$pfx\E#[^>]+>Long and wordy/, |