Merge remote-tracking branch 'origin/hotfix/0.18.0.3'0.18.0.3

1 files changed, 11 insertions, 0 deletions

diff --git a/spec/lib/attachment_to_html/adapters/rtf_spec.rb b/spec/lib/attachment_to_html/adapters/rtf_spec.rb
index a3bf0e27e..2c53b5272 100644
--- a/spec/lib/attachment_to_html/adapters/rtf_spec.rb
+++ b/spec/lib/attachment_to_html/adapters/rtf_spec.rb
@@ -60,6 +60,17 @@ describe AttachmentToHTML::Adapters::RTF do
             adapter.body.should_not include('//W3C//DTD HTML 4.01 Transitional//EN')
         end
 
+        it 'converts empty files' do
+            attachment = FactoryGirl.build(:rtf_attachment, :body => load_file_fixture('empty.rtf'))
+            adapter = AttachmentToHTML::Adapters::RTF.new(attachment)
+            adapter.body.should == ''
+        end
+
+        it 'doesnt fail if the external command returns nil' do
+            AlaveteliExternalCommand.stub(:run).and_return(nil)
+            adapter.body.should == ''
+        end
+
     end