diff options
| -rw-r--r-- | app/models/info_request.rb | 4 | ||||
| -rw-r--r-- | spec/models/request_mailer_spec.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/info_request.rb b/app/models/info_request.rb index 3f6b29a3b..0c88f2b87 100644 --- a/app/models/info_request.rb +++ b/app/models/info_request.rb @@ -23,7 +23,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: info_request.rb,v 1.190 2009-06-15 14:42:11 francis Exp $ +# $Id: info_request.rb,v 1.191 2009-06-15 15:43:19 francis Exp $ require 'digest/sha1' require File.join(File.dirname(__FILE__),'../../vendor/plugins/acts_as_xapian/lib/acts_as_xapian') @@ -290,7 +290,7 @@ public if email.from_addrs.nil? || email.from_addrs.size == 0 allow = false else - sender_email = email.from_addrs[0].to_s + sender_email = email.from_addrs[0].spec sender_domain = PublicBody.extract_domain_from_email(sender_email) allow = false # Allow any domain that has already sent reply diff --git a/spec/models/request_mailer_spec.rb b/spec/models/request_mailer_spec.rb index 2cc132b50..bd91fb778 100644 --- a/spec/models/request_mailer_spec.rb +++ b/spec/models/request_mailer_spec.rb @@ -62,7 +62,7 @@ describe RequestMailer, " when receiving incoming mail" do # Test what happens if something arrives from authority domain (@localhost) ir.incoming_messages.size.should == 1 # in the fixture - receive_incoming_mail('incoming-request-plain.email', ir.incoming_email) + receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "Geraldine <geraldinequango@localhost>") ir.incoming_messages.size.should == 2 # one more arrives # ... should get "responses arrived" message for original requester |