diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-08-04 00:24:13 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-08-04 00:24:13 +0100 |
| commit | 3bb65a5debda34cdffd2a83f4747ea19412d0410 (patch) | |
| tree | 9ddd58f511dfd832184bdcba5998f7e27c293e67 | |
| parent | 3700dca455e552ff5846949b972f4be6cf7337dd (diff) | |
| parent | 905b86c2439d58fe595267f3b39c9bfd9c300233 (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into open311-consumer
| -rw-r--r-- | perllib/FixMyStreet/App.pm | 4 | ||||
| -rw-r--r-- | perllib/FixMyStreet/DB/Result/Problem.pm | 2 | ||||
| -rw-r--r-- | t/app/helpers/send_email.t | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 68bfc728b..beea8bb11 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -296,6 +296,10 @@ sub send_email { $email->header_set( ucfirst($_), $vars->{$_} ) for grep { $vars->{$_} } qw( to from subject); + $email->header_set( 'Message-ID', sprintf('<fms-%s-%s@%s>', + time(), unpack('h*', random_bytes(5, 1)), $c->config->{EMAIL_DOMAIN} + ) ); + # pass the email into mySociety::Email to construct the on the wire 7bit # format - this should probably happen in the transport instead but hohum. my $email_text = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email( diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 09d1e058a..567ae9388 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -106,7 +106,7 @@ __PACKAGE__->has_many( # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:ifvx9FOlbui66hPyzNIAPA # Add fake relationship to stored procedure table -__PACKAGE__->has_many( +__PACKAGE__->has_one( "nearby", "FixMyStreet::DB::Result::Nearby", { "foreign.problem_id" => "self.id" }, 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'); |