Retain old handling of malformed addresses in To and Cc lines

The behaviour of the TMail backend's 'to' and 'cc' methods
where there was a malformed To: or Cc: line was to return
nil, whereas Mail returns a version of the string anyway.
We'd have to change quite a lot of code to deal with an
extra possible class of returned objects, so it's simplest
for the moment to monkey-patch Mail::Message's 'to' and 'cc'
methods to restore the old behaviour.

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/lib/mail_handler/mail_handler_spec.rb b/spec/lib/mail_handler/mail_handler_spec.rb
index d4f5737bb..01bf179f8 100644
--- a/spec/lib/mail_handler/mail_handler_spec.rb
+++ b/spec/lib/mail_handler/mail_handler_spec.rb
@@ -20,6 +20,12 @@ describe 'when creating a mail object from raw data' do
         mail.to.should == ["request-66666-caa77777@whatdotheyknow.com", "foi@example.com"]
     end
 
+    it 'should return nil for malformed To: and Cc: lines' do
+        mail = get_fixture_mail('malformed-to-and-cc.email')
+        mail.to.should == nil
+        mail.cc.should == nil
+    end
+
     it 'should convert an iso8859 email to utf8' do
         mail = get_fixture_mail('iso8859_2_raw_email.email')
         mail.subject.should match /gjatë/u