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

Conflicts:
	Gemfile.lock
	script/handle-mail-replies
	script/handle-mail-replies.rb
	spec/controllers/request_controller_spec.rb

1 files changed, 6 insertions, 0 deletions

diff --git a/spec/script/handle-mail-replies_spec.rb b/spec/script/handle-mail-replies_spec.rb
index 75a2aa6ad..406af9ee3 100644
--- a/spec/script/handle-mail-replies_spec.rb
+++ b/spec/script/handle-mail-replies_spec.rb
@@ -12,6 +12,12 @@ def mail_reply_test(email_filename)
 end
 
 describe "When filtering" do
+    it "should not fail when not in test mode" do
+        xc = ExternalCommand.new("script/handle-mail-replies")
+        xc.run(load_file_fixture("track-response-exim-bounce.email"))        
+        xc.err.should == ""
+    end
+
     it "should detect an Exim bounce" do
         r = mail_reply_test("track-response-exim-bounce.email")
         r.status.should == 1