Merge branch 'release/0.5' of github.com:sebbacon/alaveteli into release/0.5

1 files changed, 42 insertions, 14 deletions

diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index ed31b7c5c..f514d6546 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -9,6 +9,10 @@ describe IncomingMessage, " when dealing with incoming mail" do
         load_raw_emails_data(raw_emails)
     end
 
+    after(:all) do
+        ActionMailer::Base.deliveries.clear
+    end
+
     it "should return the mail Date header date for sent at" do
         @im.sent_at.should == @im.mail.date
     end
@@ -27,6 +31,31 @@ describe IncomingMessage, " when dealing with incoming mail" do
         end
     end
 
+    it "should ensure cached body text has been parsed correctly" do
+        ir = info_requests(:fancy_dog_request)
+        receive_incoming_mail('quoted-subject-iso8859-1.email', ir.incoming_email)
+        message = ir.incoming_messages[1]
+        message.get_main_body_text_unfolded.should_not include("Email has no body")
+    end
+
+    it "should correctly convert HTML even when there's a meta tag asserting that it is iso-8859-1 which would normally confuse elinks" do
+        ir = info_requests(:fancy_dog_request)
+        receive_incoming_mail('quoted-subject-iso8859-1.email', ir.incoming_email)
+        message = ir.incoming_messages[1]
+        message.parse_raw_email!
+        message.get_main_body_text_part.charset.should == "iso-8859-1"
+        message.get_main_body_text_internal.should include("política")
+    end
+
+    it "should unquote RFC 2047 headers" do
+        ir = info_requests(:fancy_dog_request)
+        receive_incoming_mail('quoted-subject-iso8859-1.email', ir.incoming_email)
+        message = ir.incoming_messages[1]
+        message.mail_from.should == "Coordenação de Relacionamento, Pesquisa e Informação/CEDI"
+        message.subject.should == "Câmara Responde:  Banco de ideias"
+    end
+
+
     it "should fold multiline sections" do
       {
         "foo\n--------\nconfidential"                                       => "foo\nFOLDED_QUOTED_SECTION\n", # basic test
@@ -102,16 +131,15 @@ describe IncomingMessage, " folding quoted parts of emails" do
 end
 
 describe IncomingMessage, " checking validity to reply to" do
-    def test_email(result, email, return_path, autosubmitted)
+    def test_email(result, email, return_path, autosubmitted = nil)
         @address = mock(TMail::Address)
         @address.stub!(:spec).and_return(email)
 
         @return_path = mock(TMail::ReturnPathHeader)
         @return_path.stub!(:addr).and_return(return_path)
-
-        @autosubmitted = mock(TMail::KeywordsHeader)
-        @autosubmitted.stub!(:keys).and_return(autosubmitted)
-
+        if !autosubmitted.nil?
+            @autosubmitted = TMail::UnstructuredHeader.new("auto-submitted", autosubmitted)
+        end
         @mail = mock(TMail::Mail)
         @mail.stub!(:from_addrs).and_return( [ @address ] )
         @mail.stub!(:[]).with("return-path").and_return(@return_path)
@@ -123,39 +151,39 @@ describe IncomingMessage, " checking validity to reply to" do
     end
 
     it "says a valid email is fine" do
-        test_email(true, "team@mysociety.org", nil, [])
+        test_email(true, "team@mysociety.org", nil)
     end
 
     it "says postmaster email is bad" do
-        test_email(false, "postmaster@mysociety.org", nil, [])
+        test_email(false, "postmaster@mysociety.org", nil)
     end
 
     it "says Mailer-Daemon email is bad" do
-        test_email(false, "Mailer-Daemon@mysociety.org", nil, [])
+        test_email(false, "Mailer-Daemon@mysociety.org", nil)
     end
 
     it "says case mangled MaIler-DaemOn email is bad" do
-        test_email(false, "MaIler-DaemOn@mysociety.org", nil, [])
+        test_email(false, "MaIler-DaemOn@mysociety.org", nil)
     end
 
     it "says Auto_Reply email is bad" do
-        test_email(false, "Auto_Reply@mysociety.org", nil, [])
+        test_email(false, "Auto_Reply@mysociety.org", nil)
     end
 
     it "says DoNotReply email is bad" do
-        test_email(false, "DoNotReply@tube.tfl.gov.uk", nil, [])
+        test_email(false, "DoNotReply@tube.tfl.gov.uk", nil)
     end
 
     it "says a filled-out return-path is fine" do
-        test_email(true, "team@mysociety.org", "Return-path: <foo@baz.com>", [])
+        test_email(true, "team@mysociety.org", "Return-path: <foo@baz.com>")
     end
 
     it "says an empty return-path is bad" do
-        test_email(false, "team@mysociety.org", "<>", [])
+        test_email(false, "team@mysociety.org", "<>")
     end
 
     it "says an auto-submitted keyword is bad" do
-        test_email(false, "team@mysociety.org", nil, ["auto-replied"])
+        test_email(false, "team@mysociety.org", nil, "auto-replied")
     end
 
 end