Merge remote-tracking branch 'origin/release/0.18'0.18

2 files changed, 10 insertions, 0 deletions

diff --git a/spec/mailers/info_request_batch_mailer.rb b/spec/mailers/info_request_batch_mailer_spec.rb
index 19791e163..19791e163 100644
--- a/spec/mailers/info_request_batch_mailer.rb
+++ b/spec/mailers/info_request_batch_mailer_spec.rb
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)