Ignore mail sent to known spam addresses

2 files changed, 11 insertions, 1 deletions

diff --git a/app/mailers/request_mailer.rb b/app/mailers/request_mailer.rb
index af1a75df9..1fd5b9ba7 100644
--- a/app/mailers/request_mailer.rb
+++ b/app/mailers/request_mailer.rb
@@ -250,7 +250,7 @@ class RequestMailer < ApplicationMailer
         if reply_info_requests.size == 0
             reason = _("Could not identify the request from the email address")
             request = InfoRequest.holding_pen_request
-            request.receive(email, raw_email, false, reason)
+            request.receive(email, raw_email, false, reason) unless SpamAddress.spam?(email.to)
             return
         end
 
diff --git a/spec/mailers/request_mailer_spec.rb b/spec/mailers/request_mailer_spec.rb
index 516d13127..2c5d6e6a9 100644
--- a/spec/mailers/request_mailer_spec.rb
+++ b/spec/mailers/request_mailer_spec.rb
@@ -78,6 +78,16 @@ describe RequestMailer, " when receiving incoming mail" do
         deliveries.clear
     end
 
+    it "should ignore mail sent to known spam addresses" do
+        @spam_address = FactoryGirl.create(:spam_address)
+
+        receive_incoming_mail('incoming-request-plain.email', @spam_address.email)
+
+        deliveries = ActionMailer::Base.deliveries
+        deliveries.size.should == 0
+        deliveries.clear
+    end
+
     it "should return incoming mail to sender when a request is stopped fully for spam" do
         # mark request as anti-spam
         ir = info_requests(:fancy_dog_request)