diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2019-09-16 16:08:30 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2019-09-30 12:44:57 +0100 |
| commit | ab8360f148d8d4026905ef8e10decee43bd16b4a (patch) | |
| tree | 971ef511329211b0f7712b199463ec723161516f | |
| parent | 61bb7723bed7a5529d927835ea4043cbfbe1c3a0 (diff) | |
[Zurich] Do not override envelope sender.
| -rw-r--r-- | perllib/FixMyStreet/SendReport/Zurich.pm | 13 | ||||
| -rw-r--r-- | t/cobrand/zurich.t | 2 |
2 files changed, 0 insertions, 15 deletions
diff --git a/perllib/FixMyStreet/SendReport/Zurich.pm b/perllib/FixMyStreet/SendReport/Zurich.pm index 5d0592f40..7416c64f9 100644 --- a/perllib/FixMyStreet/SendReport/Zurich.pm +++ b/perllib/FixMyStreet/SendReport/Zurich.pm @@ -78,17 +78,4 @@ sub send_from { return [ FixMyStreet->config('CONTACT_EMAIL'), FixMyStreet->config('CONTACT_NAME') ]; } -# For messages to external body, we also want the sender to be the -# category/body, so that bounces go there. -sub envelope_sender { - my ($self, $row) = @_; - - if ( $row->external_body ) { - my $from = $self->send_from($row); - return $from->[0]; - } - - return $self->SUPER::envelope_sender($row); -} - 1; diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t index d89c59f25..a08eb431e 100644 --- a/t/cobrand/zurich.t +++ b/t/cobrand/zurich.t @@ -624,8 +624,6 @@ subtest "external report triggers email" => sub { $mech->content_contains($report->get_extra_metadata('public_response')) or die $mech->content; send_reports_for_zurich(); $email = $mech->get_email; - my $envelope = $mech->get_email_envelope; - is $envelope->{from}, 'division@example.org', 'Correct sender envelope'; like $email->header('Subject'), qr/Weitergeleitete Meldung/, 'subject looks okay'; like $email->header('To'), qr/external_body\@example.net/, 'to line looks correct'; like $email->body, qr/External Body/, 'body has right name'; |