1 files changed, 66 insertions, 4 deletions

diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index f53a5856a..03152f5ff 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -27,7 +27,7 @@ describe IncomingMessage, " when dealing with incoming mail" do
     end
 
     it "should correctly fold various types of footer" do
-        Dir.glob(File.join(Spec::Runner.configuration.fixture_path, "files", "email-folding-example-*.txt")).each do |file|
+        Dir.glob(File.join(RSpec.configuration.fixture_path, "files", "email-folding-example-*.txt")).each do |file|
             message = File.read(file)
             parsed = IncomingMessage.remove_quoted_sections(message)
             expected = File.read("#{file}.expected")
@@ -59,12 +59,19 @@ describe IncomingMessage, " when dealing with incoming mail" do
         message.subject.should == "Câmara Responde:  Banco de ideias"
     end
 
-    it 'should not error on display of a message which has no charset set on the body part and
-        is not good utf-8' do
+    it 'should deal with GB18030 text even if the charset is missing' do
         ir = info_requests(:fancy_dog_request)
         receive_incoming_mail('no-part-charset-bad-utf8.email', ir.incoming_email)
         message = ir.incoming_messages[1]
         message.parse_raw_email!
+        message.get_main_body_text_internal.should include("贵公司负责人")
+    end
+
+    it 'should not error on display of a message which has no charset set on the body part and is not good UTF-8' do
+        ir = info_requests(:fancy_dog_request)
+        receive_incoming_mail('no-part-charset-random-data.email', ir.incoming_email)
+        message = ir.incoming_messages[1]
+        message.parse_raw_email!
         message.get_main_body_text_internal.should include("The above text was badly encoded")
     end
 
@@ -353,7 +360,7 @@ describe IncomingMessage, " when censoring data" do
     end
 
     it "should apply hard-coded privacy rules to HTML files" do
-        data = "http://#{Configuration::domain}/c/cheese"
+        data = "http://#{AlaveteliConfiguration::domain}/c/cheese"
         @im.html_mask_stuff!(data)
         data.should == "[WDTK login link]"
     end
@@ -405,12 +412,24 @@ describe IncomingMessage, " when uudecoding bad messages" do
         im.stub!(:mail).and_return(mail)
         im.extract_attachments!
 
+        im.reload
         attachments = im.foi_attachments
         attachments.size.should == 2
         attachments[1].filename.should == 'moo.txt'
         im.get_attachments_for_display.size.should == 1
     end
 
+    it "should still work when parsed from the raw email" do
+        raw_email = load_file_fixture 'inline-uuencode.email'
+        mail = MailHandler.mail_from_raw_email(raw_email)
+        im = incoming_messages :useless_incoming_message
+        im.stub!(:raw_email).and_return(raw_email)
+        im.stub!(:mail).and_return(mail)
+        im.parse_raw_email!
+        attachments = im.foi_attachments
+        attachments.size.should == 2
+    end
+
     it "should apply censor rules" do
         mail = get_fixture_mail('incoming-request-bad-uuencoding.email')
 
@@ -523,3 +542,46 @@ describe IncomingMessage, "when TNEF attachments are attached to messages" do
     end
 end
 
+describe IncomingMessage, "when extracting attachments" do
+
+    it 'handles the case where reparsing changes the body of the main part
+        and the cached attachment has been deleted' do
+        # original set of attachment attributes
+        attachment_attributes = { :url_part_number => 1,
+                                  :within_rfc822_subject => nil,
+                                  :content_type => "text/plain",
+                                  :charset => nil,
+                                  :body => "No way!\n",
+                                  :hexdigest => "0c8b1b0f5cb9c94ed15a180e73b5c7d1",
+                                  :filename => nil }
+
+        # Make a small change in the body returned for the attachment
+        new_attachment_attributes = attachment_attributes.merge(:body => "No way!",
+                                                                :hexdigest => "74d2c0a41e074f9cebe49324d5b47414")
+
+
+        # Simulate parsing with the original attachments
+        MailHandler.stub!(:get_attachment_attributes).and_return([attachment_attributes])
+        incoming_message = incoming_messages(:useless_incoming_message)
+
+        # Extract the attachments
+        incoming_message.extract_attachments!
+
+        # delete the cached file for the main body part
+        main = incoming_message.get_main_body_text_part
+        main.delete_cached_file!
+
+        # Simulate reparsing with the slightly changed body
+        MailHandler.stub!(:get_attachment_attributes).and_return([new_attachment_attributes])
+
+        # Re-extract the attachments
+        incoming_message.extract_attachments!
+
+        attachments = incoming_message.foi_attachments
+        attachments.size.should == 1
+        attachments.first.hexdigest.should == "74d2c0a41e074f9cebe49324d5b47414"
+        attachments.first.body.should == 'No way!'
+    end
+
+end
+