Merge commit 'peter/master'

Conflicts:
	config/environment.rb

Merge patch from Peter Collingbourne for handling Outlook attachments.

1 files changed, 18 insertions, 0 deletions

diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb
index 47f089ca2..cf51c8a42 100644
--- a/spec/models/incoming_message_spec.rb
+++ b/spec/models/incoming_message_spec.rb
@@ -250,5 +250,23 @@ describe IncomingMessage, "when messages are attached to messages" do
     end
 end
 
+describe IncomingMessage, "when Outlook messages are attached to messages" do
+    it "should flatten all the attachments out" do
+        mail_body = load_file_fixture('incoming-request-oft-attachments.email')
+        mail = TMail::Mail.parse(mail_body)
+        mail.base64_decode
+
+        im = IncomingMessage.new
+        im.stub!(:mail).and_return(mail)
+        ir = InfoRequest.new
+        im.info_request = ir
+
+        attachments = im.get_attachments_for_display
+        attachments.size.should == 2
+        attachments[0].display_filename.should == 'test.txt'
+        attachments[1].display_filename.should == 'attach.txt'
+    end
+end
+