Subject: hihi
Date: Fri, 02 Oct 1993 00:00:00 +0000
+> quoted text
zzzzzz
EOF
$im->add($mime);
like($rev, qr/\A[a-f0-9]{40}/, "good revision committed");
@ls = $git->qx(qw(ls-tree -r --name-only HEAD));
chomp @ls;
+
+ # multipart with two text bodies
+ my %attr_text = (attributes => { content_type => 'text/plain' });
+ my $parts = [
+ Email::MIME->create(%attr_text, body => 'hi'),
+ Email::MIME->create(%attr_text, body => 'bye')
+ ];
+ $mime = Email::MIME->create(
+ header_str => [
+ From => 'a@example.com',
+ Subject => 'blargh',
+ 'Message-ID' => '<multipart@example.com>',
+ 'In-Reply-To' => '<irp@example.com>'
+ ],
+ parts => $parts,
+ );
+ $im->add($mime);
+
+ # multipart with attached patch + filename
+ $parts = [ Email::MIME->create(%attr_text, body => 'hi, see attached'),
+ Email::MIME->create(
+ attributes => {
+ content_type => 'text/plain',
+ filename => "foo&.patch",
+ },
+ body => "--- a/file\n+++ b/file\n" .
+ "@@ -49, 7 +49,34 @@\n"
+ )
+ ];
+ $mime = Email::MIME->create(
+ header_str => [
+ From => 'a@example.com',
+ Subject => '[PATCH] asdf',
+ 'Message-ID' => '<patch@example.com>'
+ ],
+ parts => $parts
+ );
+ $im->add($mime);
+
+ # multipart collapsed to single quoted-printable text/plain
+ $parts = [
+ Email::MIME->create(
+ attributes => {
+ content_type => 'text/plain',
+ encoding => 'quoted-printable'
+ },
+ body => 'hi = bye',
+ )
+ ];
+ $mime = Email::MIME->create(
+ header_str => [
+ From => 'qp@example.com',
+ Subject => 'QP',
+ 'Message-ID' => '<qp@example.com>',
+ ],
+ parts => $parts,
+ );
+ like($mime->body_raw, qr/hi =3D bye=/, 'our test used QP correctly');
+ $im->add($mime);
+
+ $im->done;
}
test_psgi($app, sub {
my $path = '/blah@example.com/';
my $res = $cb->(GET($pfx . $path));
is(200, $res->code, "success for $path");
- like($res->content, qr!<title>hihi - Me</title>!,
- "HTML returned");
+ my $html = $res->content;
+ like($html, qr!<title>hihi - Me</title>!, 'HTML returned');
+ like($html, qr!<a\nhref="raw"!s, 'raw link present');
+ like($html, qr!> quoted text!s, 'quoted text inline');
$path .= 'f/';
$res = $cb->(GET($pfx . $path));
my $location = $res->header('Location');
like($location, qr!/blah\@example\.com/\z!,
'/$MESSAGE_ID/f/ redirected to /$MESSAGE_ID/');
+
+ $res = $cb->(GET($pfx . '/multipart@example.com/'));
+ like($res->content,
+ qr/hi\n.*-- Attachment #2.*\nbye\n/s, 'multipart split');
+
+ $res = $cb->(GET($pfx . '/patch@example.com/'));
+ $html = $res->content;
+ like($html, qr!see attached!, 'original body');
+ like($html, qr!.*Attachment #2: foo&(?:amp|#38);\.patch --!,
+ 'parts split with filename');
+
+ $res = $cb->(GET($pfx . '/qp@example.com/'));
+ like($res->content, qr/\bhi = bye\b/, "HTML output decoded QP");
});
test_psgi($app, sub {
-# Copyright (C) 2013-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2013-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
-use warnings;
use Test::More;
use PublicInbox::TestCommon;
-use Email::MIME;
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';
+# this only tests View.pm internals which are subject to change,
+# see t/plack.t for tests against the PSGI interface.
-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
-{
- my $body = <<EOF;
-So and so wrote:
-> keep this inline
-
-OK
-
-> Long and wordy reply goes here and it is split across multiple lines.
-> We generate links to a separate full page where quoted-text is inline.
-> This is
->
-> 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
-EOF
- my $s = Email::Simple->create(
- header => [
- From => 'a@example.com',
- To => 'b@example.com',
- 'Content-Type' => 'text/plain',
- 'Message-ID' => '<hello@example.com>',
- Subject => 'this is a subject',
- ],
- body => $body,
- )->as_string;
- my $mime = Email::MIME->new($s);
- my $html = msg_html($ctx, $mime);
-
- # ghetto tests
- like($html, qr!<a\nhref="raw"!s, "raw link present");
- like($html, qr/hello world\b/, "body present");
- like($html, qr/> keep this inline/, "short quoted text is inline");
-}
-
-# multipart crap
-{
- my $parts = [
- Email::MIME->create(
- attributes => { content_type => 'text/plain', },
- body => 'hi',
- ),
- Email::MIME->create(
- attributes => { content_type => 'text/plain', },
- body => 'bye',
- )
- ];
- my $mime = Email::MIME->create(
- header_str => [
- From => 'a@example.com',
- Subject => 'blargh',
- 'Message-ID' => '<blah@example.com>',
- 'In-Reply-To' => '<irp@example.com>',
- ],
- parts => $parts,
- );
-
- my $html = msg_html($ctx, $mime);
- like($html, qr/hi\n.*-- Attachment #2.*\nbye\n/s, "multipart split");
-}
-
-# multipart email with attached patch
-{
- my $parts = [
- Email::MIME->create(
- attributes => { content_type => 'text/plain', },
- body => 'hi, see attached patch',
- ),
- Email::MIME->create(
- attributes => {
- content_type => 'text/plain',
- filename => "foo&.patch",
- },
- body => "--- a/file\n+++ b/file\n" .
- "@@ -49, 7 +49,34 @@\n",
- ),
- ];
- my $mime = Email::MIME->create(
- header_str => [
- From => 'a@example.com',
- Subject => '[PATCH] asdf',
- 'Message-ID' => '<patch@example.com>',
- ],
- parts => $parts,
- );
-
- 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' => '<qp@example.com>',
- ],
- 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" <a@a>';
- 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');
+my $cols = PublicInbox::View::COLS();
+my @addr;
+until (length(join(', ', @addr)) > ($cols * 2)) {
+ push @addr, '"l, f" <a@a>';
+ 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();