diff options
| -rw-r--r-- | spec/lib/mail_handler/mail_handler_spec.rb | 4 | ||||
| -rw-r--r-- | spec/models/incoming_message_spec.rb | 17 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 4 |
3 files changed, 11 insertions, 14 deletions
diff --git a/spec/lib/mail_handler/mail_handler_spec.rb b/spec/lib/mail_handler/mail_handler_spec.rb index fa29132bc..fc29817f6 100644 --- a/spec/lib/mail_handler/mail_handler_spec.rb +++ b/spec/lib/mail_handler/mail_handler_spec.rb @@ -1,10 +1,6 @@ # coding: utf-8 require File.expand_path(File.dirname(__FILE__) + '../../../spec_helper') -def get_fixture_mail(filename) - MailHandler.mail_from_raw_email(load_file_fixture(filename)) -end - describe 'when creating a mail object from raw data' do it 'should correctly parse a multipart email with a linebreak in the boundary' do diff --git a/spec/models/incoming_message_spec.rb b/spec/models/incoming_message_spec.rb index 9e6b0fe33..a94117c60 100644 --- a/spec/models/incoming_message_spec.rb +++ b/spec/models/incoming_message_spec.rb @@ -403,9 +403,10 @@ describe IncomingMessage, " when uudecoding bad messages" do load_raw_emails_data end + + it "should be able to do it at all" do - mail_body = load_file_fixture('incoming-request-bad-uuencoding.email') - mail = MailHandler.mail_from_raw_email(mail_body) + mail = get_fixture_mail('incoming-request-bad-uuencoding.email') im = incoming_messages(:useless_incoming_message) im.stub!(:mail).and_return(mail) im.extract_attachments! @@ -417,8 +418,7 @@ describe IncomingMessage, " when uudecoding bad messages" do end it "should apply censor rules" do - mail_body = load_file_fixture('incoming-request-bad-uuencoding.email') - mail = MailHandler.mail_from_raw_email(mail_body) + mail = get_fixture_mail('incoming-request-bad-uuencoding.email') im = incoming_messages(:useless_incoming_message) im.stub!(:mail).and_return(mail) @@ -446,8 +446,7 @@ describe IncomingMessage, "when messages are attached to messages" do end it "should flatten all the attachments out" do - mail_body = load_file_fixture('incoming-request-attach-attachments.email') - mail = MailHandler.mail_from_raw_email(mail_body) + mail = get_fixture_mail('incoming-request-attach-attachments.email') im = incoming_messages(:useless_incoming_message) im.stub!(:mail).and_return(mail) @@ -470,8 +469,7 @@ describe IncomingMessage, "when Outlook messages are attached to messages" do end it "should flatten all the attachments out" do - mail_body = load_file_fixture('incoming-request-oft-attachments.email') - mail = MailHandler.mail_from_raw_email(mail_body) + mail = get_fixture_mail('incoming-request-oft-attachments.email') im = incoming_messages(:useless_incoming_message) im.stub!(:mail).and_return(mail) @@ -491,8 +489,7 @@ describe IncomingMessage, "when TNEF attachments are attached to messages" do end it "should flatten all the attachments out" do - mail_body = load_file_fixture('incoming-request-tnef-attachments.email') - mail = MailHandler.mail_from_raw_email(mail_body) + mail = get_fixture_mail('incoming-request-tnef-attachments.email') im = incoming_messages(:useless_incoming_message) im.stub!(:mail).and_return(mail) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 248dff70e..e6d81540b 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -208,6 +208,10 @@ def load_raw_emails_data end end +def get_fixture_mail(filename) + MailHandler.mail_from_raw_email(load_file_fixture(filename)) +end + def parse_all_incoming_messages IncomingMessage.find(:all).each{|x| x.parse_raw_email!} end |