Merge branch 'master' of ssh://git.mysociety.org/data/git/public/alaveteli into hotfix/0.21.0.30

1 files changed, 21 insertions, 0 deletions

diff --git a/spec/mailers/request_mailer_spec.rb b/spec/mailers/request_mailer_spec.rb
index 9e98dbc00..6a45d0e94 100644
--- a/spec/mailers/request_mailer_spec.rb
+++ b/spec/mailers/request_mailer_spec.rb
@@ -38,6 +38,12 @@ describe RequestMailer, " when receiving incoming mail" do
         deliveries.clear
     end
 
+    it "puts messages with a malformed To: in the holding pen" do
+        request = FactoryGirl.create(:info_request)
+        receive_incoming_mail('incoming-request-plain.email', 'asdfg')
+        expect(InfoRequest.holding_pen_request.incoming_messages).to have(1).item
+    end
+
     it "should parse attachments from mails sent with apple mail" do
         ir = info_requests(:fancy_dog_request)
         ir.incoming_messages.size.should == 1
@@ -178,6 +184,21 @@ describe RequestMailer, " when receiving incoming mail" do
         deliveries.clear
     end
 
+    it "discards rejected responses with a malformed From: when set to bounce" do
+        ir = info_requests(:fancy_dog_request)
+        ir.allow_new_responses_from = 'nobody'
+        ir.handle_rejected_responses = 'bounce'
+        ir.save!
+        ir.incoming_messages.size.should == 1
+
+        receive_incoming_mail('incoming-request-plain.email', ir.incoming_email, "")
+        ir.incoming_messages.size.should == 1
+
+        deliveries = ActionMailer::Base.deliveries
+        deliveries.size.should == 0
+        deliveries.clear
+    end
+
     it "should send all new responses to holding pen if a request is marked to do so" do
         # mark request as anti-spam
         ir = info_requests(:fancy_dog_request)