github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 19:57:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FEATURE: new 'block_auto_generated_emails' site setting

Browse Source
This commit is contained in:
Régis Hanol
2016-04-20 21:29:27 +02:00
parent f62ffce03b
commit 4960b62110
16 changed files with 81 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spec/components/email/receiver_spec.rb
View File

@ -59,11 +59,8 @@ describe Email::Receiver do
expect { process(:bounced_email) }.to raise_error(Email::Receiver::BouncedEmailError)
end
it "raises an AutoGeneratedEmailReplyError when email contains a reply marked
as reply to an auto generated email".squish do
expect { process(:bounced_email_2) }
.to raise_error(Email::Receiver::AutoGeneratedEmailReplyError)
it "raises an AutoGeneratedEmailReplyError when email contains a marked reply" do
expect { process(:bounced_email_2) }.to raise_error(Email::Receiver::AutoGeneratedEmailReplyError)
end
context "reply" do
@ -156,7 +153,12 @@ describe Email::Receiver do
it "doesn't raise an AutoGeneratedEmailError when the mail is auto generated but is whitelisted" do
SiteSetting.auto_generated_whitelist = "foo@bar.com|discourse@bar.com"
expect { process(:auto_generated_whitelisted) }.not_to raise_error
expect { process(:auto_generated_whitelisted) }.to change { topic.posts.count }
end
it "doesn't raise an AutoGeneratedEmailError when block_auto_generated_emails is disabled" do
SiteSetting.block_auto_generated_emails = false
expect { process(:auto_generated_unblocked) }.to change { topic.posts.count }
end
describe 'Unsubscribing via email' do