github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 15:28:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Replace email_blacklist_regexp with email_domains_blacklist site setting

Browse Source
This commit is contained in:
Neil Lalonde
2013-02-13 22:24:32 -05:00
parent d9d2565c25
commit aaf96f1e29
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spec/models/user_spec.rb
View File

@ -456,22 +456,27 @@ describe User do
user.should be_valid
end
it 'should reject some emails based on the email_blacklist_regexp site setting' do
SiteSetting.stubs(:email_blacklist_regexp).returns('@mailinator')
it 'should reject some emails based on the email_domains_blacklist site setting' do
SiteSetting.stubs(:email_domains_blacklist).returns('mailinator.com')
Fabricate.build(:user, email: 'notgood@mailinator.com').should_not be_valid
Fabricate.build(:user, email: 'mailinator@gmail.com').should be_valid
end
it 'should reject some emails based on the email_blacklist_regexp site setting' do
SiteSetting.stubs(:email_blacklist_regexp).returns('@(mailinator|aol)\.com')
it 'should reject some emails based on the email_domains_blacklist site setting' do
SiteSetting.stubs(:email_domains_blacklist).returns('mailinator.com|trashmail.net')
Fabricate.build(:user, email: 'notgood@mailinator.com').should_not be_valid
Fabricate.build(:user, email: 'notgood@aol.com').should_not be_valid
Fabricate.build(:user, email: 'aol+mailinator@gmail.com').should be_valid
Fabricate.build(:user, email: 'notgood@trashmail.net').should_not be_valid
Fabricate.build(:user, email: 'mailinator.com@gmail.com').should be_valid
end
it 'should reject some emails based on the email_blacklist_regexp site setting ignoring case' do
SiteSetting.stubs(:email_blacklist_regexp).returns('@mailinator')
Fabricate.build(:user, email: 'notgood@MAILINATOR.COM').should_not be_valid
it 'should reject some emails based on the email_domains_blacklist site setting ignoring case' do
SiteSetting.stubs(:email_domains_blacklist).returns('trashmail.net')
Fabricate.build(:user, email: 'notgood@TRASHMAIL.NET').should_not be_valid
end
it 'should not interpret a period as a wildcard' do
SiteSetting.stubs(:email_domains_blacklist).returns('trashmail.net')
Fabricate.build(:user, email: 'good@trashmailinet.com').should be_valid
end
end