testcommon: introduce mime_load sub

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

diff --git a/t/plack.t b/t/plack.t
index e23658fd3003d56d06acc887dd6c9effd272096e..d45dbcd2085b2a286625a43299fd7ff359d4f87b 100644 (file)
--- a/t/plack.t
+++ b/t/plack.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
@@ -32,7 +32,7 @@ my $git = PublicInbox::Git->new($inboxdir);
 my $im = PublicInbox::Import->new($git, 'test', $addr);
 # ensure successful message delivery
 {
-       my $mime = Email::MIME->new(<<EOF);
+       my $mime = PublicInbox::MIME->new(<<EOF);
 From: Me <me\@example.com>
 To: You <you\@example.com>
 Cc: $addr
@@ -52,11 +52,12 @@ EOF
 
        # multipart with two text bodies
        my %attr_text = (attributes => { content_type => 'text/plain' });
+       $mime = mime_load 't/plack-2-txt-bodies.eml', sub {
        my $parts = [
                Email::MIME->create(%attr_text, body => 'hi'),
                Email::MIME->create(%attr_text, body => 'bye')
        ];
-       $mime = Email::MIME->create(
+       Email::MIME->create(
                header_str => [
                        From => 'a@example.com',
                        Subject => 'blargh',
@@ -64,11 +65,13 @@ EOF
                        'In-Reply-To' => '<irp@example.com>'
                ],
                parts => $parts,
-       );
+       )}; # mime_load sub
        $im->add($mime);
 
        # multipart with attached patch + filename
-       $parts = [ Email::MIME->create(%attr_text, body => 'hi, see attached'),
+       $mime = mime_load 't/plack-attached-patch.eml', sub {
+       my $parts = [
+               Email::MIME->create(%attr_text, body => 'hi, see attached'),
                Email::MIME->create(
                        attributes => {
                                        content_type => 'text/plain',
@@ -78,18 +81,19 @@ EOF
                                "@@ -49, 7 +49,34 @@\n"
                        )
        ];
-       $mime = Email::MIME->create(
+       Email::MIME->create(
                header_str => [
                        From => 'a@example.com',
                        Subject => '[PATCH] asdf',
                        'Message-ID' => '<patch@example.com>'
                ],
                parts => $parts
-       );
+       )}; # mime_load sub
        $im->add($mime);
 
        # multipart collapsed to single quoted-printable text/plain
-       $parts = [
+       $mime = mime_load 't/plack-qp.eml', sub {
+       my $parts = [
                Email::MIME->create(
                        attributes => {
                                content_type => 'text/plain',
@@ -98,17 +102,34 @@ EOF
                        body => 'hi = bye',
                )
        ];
-       $mime = Email::MIME->create(
+       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);
 
+       my $crlf = <<EOF;
+From: Me
+  <me\@example.com>
+To: $addr
+Message-Id: <crlf\@example.com>
+Subject: carriage
+  return
+  in
+  long
+  subject
+Date: Fri, 02 Oct 1993 00:00:00 +0000
+
+:(
+EOF
+       $crlf =~ s/\n/\r\n/sg;
+       $im->add(PublicInbox::MIME->new($crlf));
+
        $im->done;
 }
 
@@ -120,6 +141,16 @@ test_psgi($app, sub {
        }
 });
 
+test_psgi($app, sub {
+       my ($cb) = @_;
+       my $res = $cb->(GET('http://example.com/test/crlf@example.com/'));
+       is($res->code, 200, 'retrieved CRLF as HTML');
+       unlike($res->content, qr/\r/, 'no CR in HTML');
+       $res = $cb->(GET('http://example.com/test/crlf@example.com/raw'));
+       is($res->code, 200, 'retrieved CRLF raw');
+       like($res->content, qr/\r/, 'CR preserved in raw message');
+});
+
 # redirect with newsgroup
 test_psgi($app, sub {
        my ($cb) = @_;