X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fview.t;h=38c12fcc1fda8bddd64be81dba0c17920228142b;hb=62f28026e624ed30d620063a0fa92cbedb7f6673;hp=067f9890cc271abc0d1e7195b5d0e823ce677f6d;hpb=b926665849f6d317b97cf679becf1e315df701b0;p=public-inbox.git diff --git a/t/view.t b/t/view.t index 067f9890..38c12fcc 100644 --- a/t/view.t +++ b/t/view.t @@ -1,10 +1,42 @@ -# Copyright (C) 2013, Eric Wong and all contributors -# License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt) +# Copyright (C) 2013-2019 all contributors +# License: AGPL-3.0+ use strict; use warnings; use Test::More; +use PublicInbox::TestCommon; use Email::MIME; -use PublicInbox::View; +require_mods('Plack::Util'); +use_ok 'PublicInbox::View'; +use_ok 'PublicInbox::Config'; + +# FIXME: make this test less fragile +my $ctx = { + env => { HTTP_HOST => 'example.com', 'psgi.url_scheme' => 'http' }, + -inbox => Plack::Util::inline_object( + name => 'test', + over => sub { undef }, + search => sub { undef }, + base_url => sub { 'http://example.com/' }, + cloneurl => sub {[]}, + nntp_url => sub {[]}, + max_git_epoch => sub { undef }, + description => sub { '' }), + www => Plack::Util::inline_object(style => sub { '' }), +}; +$ctx->{-inbox}->{-primary_address} = 'test@example.com'; + +sub msg_html ($$) { + my ($ctx, $mime) = @_; + + my $s = ''; + my $r = PublicInbox::View::msg_html($ctx, $mime); + my $body = $r->[2]; + while (defined(my $buf = $body->getline)) { + $s .= $buf; + } + $body->close; + $s; +} # plain text { @@ -18,7 +50,14 @@ OK > We generate links to a separate full page where quoted-text is inline. > This is > -> Currently 5 lines +> Currently 12 lines +> See MAX_INLINE_QUOTED +> See MAX_INLINE_QUOTED +> See MAX_INLINE_QUOTED +> See MAX_INLINE_QUOTED +> See MAX_INLINE_QUOTED +> See MAX_INLINE_QUOTED +> See MAX_INLINE_QUOTED > See MAX_INLINE_QUOTED hello world @@ -32,25 +71,14 @@ EOF Subject => 'this is a subject', ], body => $body, - ); - $s = Email::MIME->new($s->as_string); - my $html = PublicInbox::View->as_html($s); + )->as_string; + my $mime = Email::MIME->new($s); + my $html = msg_html($ctx, $mime); - # ghetto - like($html, qr/]+>> Long and wordy/, - "long quoted text is anchored"); - - # short page - my $pfx = "http://example.com/test/f"; - my $short = PublicInbox::View->as_html($s, $pfx); - like($short, qr/\n> keep this inline/, - "short quoted text is inline"); - like($short, qr/ $parts, ); - my $html = PublicInbox::View->as_html($mime); - like($html, qr/hi\n-+ part #2 -+\nbye\n/, "multipart split"); + my $html = msg_html($ctx, $mime); + like($html, qr/hi\n.*-- Attachment #2.*\nbye\n/s, "multipart split"); } # multipart email with attached patch @@ -89,7 +117,7 @@ EOF Email::MIME->create( attributes => { content_type => 'text/plain', - filename => "foo.patch", + filename => "foo&.patch", }, body => "--- a/file\n+++ b/file\n" . "@@ -49, 7 +49,34 @@\n", @@ -104,9 +132,67 @@ EOF parts => $parts, ); - my $html = PublicInbox::View->as_html($mime); - like($html, qr!see attached patch\n-+ foo\.patch -+\n--- a/file\n!, + my $html = msg_html($ctx, $mime); + like($html, qr!.*Attachment #2: foo&(?:amp|#38);\.patch --!, "parts split with filename"); } +# multipart collapsed to single quoted-printable text/plain +{ + my $parts = [ + Email::MIME->create( + attributes => { + content_type => 'text/plain', + encoding => 'quoted-printable', + }, + body => 'hi = bye', + ) + ]; + my $mime = Email::MIME->create( + header_str => [ + From => 'qp@example.com', + Subject => 'QP', + 'Message-ID' => '', + ], + parts => $parts, + ); + + my $orig = $mime->body_raw; + my $html = msg_html($ctx, $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'); +} + +{ + my $cols = PublicInbox::View::COLS(); + my @addr; + until (length(join(', ', @addr)) > ($cols * 2)) { + push @addr, '"l, f" '; + my $n = int(rand(20)) + 1; + push @addr, ('x'x$n).'@x'; + } + my $orig = join(', ', @addr); + my $res = PublicInbox::View::fold_addresses($orig.''); + isnt($res, $orig, 'folded result'); + unlike($res, qr/l,\n\tf/s, '"last, first" no broken'); + my @nospc = ($res, $orig); + s/\s+//g for @nospc; + is($nospc[0], $nospc[1], 'no addresses lost in translation'); + my $tws = PublicInbox::View::fold_addresses($orig.' '); + # (Email::Simple drops leading whitespace, but not trailing) + $tws =~ s/ \z//; + is($tws, $res, 'not thrown off by trailing whitespace'); +} + done_testing();