Allow attachment of emails in email_send

Required by Zurich for mysociety/FixMyStreet-Commercial#675

3 files changed, 120 insertions, 9 deletions

diff --git a/t/app/helpers/grey.gif b/t/app/helpers/grey.gif
new file mode 100644
index 000000000..98eee7d12
--- /dev/null
+++ b/t/app/helpers/grey.gif
diff --git a/t/app/helpers/send_email.t b/t/app/helpers/send_email.t
index 14c7d363b..d1609cb2f 100644
--- a/t/app/helpers/send_email.t
+++ b/t/app/helpers/send_email.t
@@ -9,12 +9,16 @@ BEGIN {
     FixMyStreet->test_mode(1);
 }
 
-use Test::More tests => 5;
+use Test::More;
+use Test::LongString;
 
 use Catalyst::Test 'FixMyStreet::App';
 
 use Email::Send::Test;
-use Path::Class;
+use Path::Tiny;
+
+use FixMyStreet::TestMech;
+my $mech = FixMyStreet::TestMech->new;
 
 my $c = ctx_request("/");
 
@@ -33,16 +37,66 @@ my @emails = Email::Send::Test->emails;
 is scalar(@emails), 1, "caught one email";
 
 # Get the email, check it has a date and then strip it out
-my $email_as_string = $emails[0]->as_string;
-ok $email_as_string =~ s{\s+Date:\s+\S.*?$}{}xms, "Found and stripped out date";
-ok $email_as_string =~ s{\s+Message-ID:\s+\S.*?$}{}xms, "Found and stripped out message ID (contains epoch)";
+my $email_as_string = $mech->get_first_email(@emails);
 
-my $expected_email_content =   file(__FILE__)->dir->file('send_email_sample.txt')->slurp;
+my $expected_email_content =   path(__FILE__)->parent->child('send_email_sample.txt')->slurp;
 my $name = FixMyStreet->config('CONTACT_NAME');
 $name = "\"$name\"" if $name =~ / /;
 my $sender = $name . ' <' . FixMyStreet->config('DO_NOT_REPLY_EMAIL') . '>';
 $expected_email_content =~ s{CONTACT_EMAIL}{$sender};
 
-is $email_as_string,
-$expected_email_content,
-  "email is as expected";
+is_string $email_as_string, $expected_email_content, "email is as expected";
+
+subtest 'MIME attachments' => sub {
+    my $data = path(__FILE__)->parent->child('grey.gif')->slurp_raw;
+
+    Email::Send::Test->clear;
+    my @emails = Email::Send::Test->emails;
+    is scalar(@emails), 0, "reset";
+
+    ok $c->send_email( 'test.txt',
+        { to => 'test@recipient.com',
+          attachments => [
+             {
+                body => $data,
+                attributes => {
+                    filename => 'foo.gif',
+                    content_type => 'image/gif',
+                    encoding => 'quoted-printable',
+                    name => 'foo.gif',
+                },
+             },
+             {
+                body => $data,
+                attributes => {
+                    filename => 'bar.gif',
+                    content_type => 'image/gif',
+                    encoding => 'quoted-printable',
+                    name => 'bar.gif',
+                },
+             },
+         ]
+        } ), "sent an email with MIME attachments";
+
+    @emails = $mech->get_email;
+    is scalar(@emails), 1, "caught one email";
+
+    my $email_as_string = $mech->get_first_email(@emails);
+
+    my ($boundary) = $email_as_string =~ /boundary="([A-Za-z0-9.]*)"/ms;
+    my $changes = $email_as_string =~ s{$boundary}{}g;
+    is $changes, 5, '5 boundaries'; # header + 4 around the 3x parts (text + 2 images)
+
+    my $expected_email_content = path(__FILE__)->parent->child('send_email_sample_mime.txt')->slurp;
+    $expected_email_content =~ s{CONTACT_EMAIL}{$sender}g;
+
+    is_string $email_as_string, $expected_email_content, 'MIME email text ok'
+        or do {
+            (my $test_name = $0) =~ s{/}{_}g;
+            my $path = path("test-output-$test_name.tmp");
+            $path->spew($email_as_string);
+            diag "Saved output in $path";
+        };
+};
+
+done_testing;
diff --git a/t/app/helpers/send_email_sample_mime.txt b/t/app/helpers/send_email_sample_mime.txt
new file mode 100644
index 000000000..4ce0f9520
--- /dev/null
+++ b/t/app/helpers/send_email_sample_mime.txt
@@ -0,0 +1,57 @@
+MIME-Version: 1.0
+Subject: test email =?utf-8?Q?=E2=98=BA?=
+Content-Type: multipart/mixed; boundary=""
+To: test@recipient.com
+Content-Transfer-Encoding: 7bit
+From: CONTACT_EMAIL
+
+
+--
+MIME-Version: 1.0
+Subject: test email =?utf-8?Q?=E2=98=BA?=
+Content-Type: text/plain; charset="utf-8"
+To: test@recipient.com
+Content-Transfer-Encoding: quoted-printable
+From: CONTACT_EMAIL
+
+Hello,
+
+This is a test email where foo: bar.
+
+utf8: =E6=88=91=E4=BB=AC=E5=BA=94=E8=AF=A5=E8=83=BD=E5=A4=9F=E6=97=A0=E7=BC=
+=9D=E5=A4=84=E7=90=86UTF8=E7=BC=96=E7=A0=81
+
+  indented_text
+
+long line: Lorem ipsum dolor sit amet, consectetur adipisicing elit,
+sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris
+nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in
+reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+pariatur. Excepteur sint occaecat cupidatat non proident, sunt in
+culpa qui officia deserunt mollit anim id est laborum.
+
+Yours,=20=20
+FixMyStreet.=20=
+
+
+
+--
+MIME-Version: 1.0
+Content-Type: image/gif; name="foo.gif"
+Content-Disposition: inline; filename="foo.gif"
+Content-Transfer-Encoding: quoted-printable
+
+GIF89a=01=00=01=00=80=00=00=00=00=00=CC=CC=CC,=00=00=00=00=01=00=01=00=00=
+=02=01L=00;=
+
+--
+MIME-Version: 1.0
+Content-Type: image/gif; name="bar.gif"
+Content-Disposition: inline; filename="bar.gif"
+Content-Transfer-Encoding: quoted-printable
+
+GIF89a=01=00=01=00=80=00=00=00=00=00=CC=CC=CC,=00=00=00=00=01=00=01=00=00=
+=02=01L=00;=
+
+----