aboutsummaryrefslogtreecommitdiffstats
path: root/spec/mailers
diff options
context:
space:
mode:
authorGareth Rees <gareth@mysociety.org>2014-04-07 12:05:17 +0100
committerGareth Rees <gareth@mysociety.org>2014-04-07 12:05:17 +0100
commit715643868b8c198e0310c596c9cb0972cde9f947 (patch)
treea3cdf3f12cb9b6b9e593d04956c05be97a3c06fc /spec/mailers
parentbb1837146136a4feec12eb191bbde1487fff5234 (diff)
parent6922b3f45ad38a8e52050ca56733b4e950e69cbd (diff)
Merge branch 'issues/1317-holding-pen-spam' into rails-3-develop
Diffstat (limited to 'spec/mailers')
-rw-r--r--spec/mailers/request_mailer_spec.rb10
1 files changed, 10 insertions, 0 deletions
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)