diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-08-17 22:56:37 +0100 |
| commit | 3b5d561700b184c20e63111d4cbc1daab78e16c6 (patch) | |
| tree | f0c53c6bf8d4ebf12e5388053ad856fb0d0e7b86 /t/app/helpers/send_email.t | |
| parent | 390f8e8ad1e10f832c4323c39bed2c883744a03f (diff) | |
| parent | f38b8e985697c35a62374a2f02dce2d681ef58cd (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
db/schema.sql
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/DB/Result/User.pm
t/app/controller/admin.t
templates/web/default/admin/update_edit.html
web/css/core.css
Diffstat (limited to 't/app/helpers/send_email.t')
| -rw-r--r-- | t/app/helpers/send_email.t | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/app/helpers/send_email.t b/t/app/helpers/send_email.t index ac7e5b5c2..8c043f701 100644 --- a/t/app/helpers/send_email.t +++ b/t/app/helpers/send_email.t @@ -9,7 +9,7 @@ BEGIN { FixMyStreet->test_mode(1); } -use Test::More tests => 5; +use Test::More tests => 6; use Email::Send::Test; use Path::Class; @@ -44,6 +44,7 @@ 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 $expected_email_content = file(__FILE__)->dir->file('send_email_sample.txt')->slurp; my $name = FixMyStreet->config('CONTACT_NAME'); |