mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-18 09:05:06 +01:00
Add specs for BlackListedEmailValidator (#9651)
* Add specs for BlackListedEmailValidator * Use instance variable
This commit is contained in:
parent
29484f6555
commit
05edec6917
@ -2,31 +2,32 @@
|
|||||||
|
|
||||||
class BlacklistedEmailValidator < ActiveModel::Validator
|
class BlacklistedEmailValidator < ActiveModel::Validator
|
||||||
def validate(user)
|
def validate(user)
|
||||||
user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?(user.email)
|
@email = user.email
|
||||||
|
user.errors.add(:email, I18n.t('users.invalid_email')) if blocked_email?
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def blocked_email?(value)
|
def blocked_email?
|
||||||
on_blacklist?(value) || not_on_whitelist?(value)
|
on_blacklist? || not_on_whitelist?
|
||||||
end
|
end
|
||||||
|
|
||||||
def on_blacklist?(value)
|
def on_blacklist?
|
||||||
return true if EmailDomainBlock.block?(value)
|
return true if EmailDomainBlock.block?(@email)
|
||||||
return false if Rails.configuration.x.email_domains_blacklist.blank?
|
return false if Rails.configuration.x.email_domains_blacklist.blank?
|
||||||
|
|
||||||
domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
|
domains = Rails.configuration.x.email_domains_blacklist.gsub('.', '\.')
|
||||||
regexp = Regexp.new("@(.+\\.)?(#{domains})", true)
|
regexp = Regexp.new("@(.+\\.)?(#{domains})", true)
|
||||||
|
|
||||||
value =~ regexp
|
@email =~ regexp
|
||||||
end
|
end
|
||||||
|
|
||||||
def not_on_whitelist?(value)
|
def not_on_whitelist?
|
||||||
return false if Rails.configuration.x.email_domains_whitelist.blank?
|
return false if Rails.configuration.x.email_domains_whitelist.blank?
|
||||||
|
|
||||||
domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.')
|
domains = Rails.configuration.x.email_domains_whitelist.gsub('.', '\.')
|
||||||
regexp = Regexp.new("@(.+\\.)?(#{domains})$", true)
|
regexp = Regexp.new("@(.+\\.)?(#{domains})$", true)
|
||||||
|
|
||||||
value !~ regexp
|
@email !~ regexp
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
31
spec/validators/blacklisted_email_validator_spec.rb
Normal file
31
spec/validators/blacklisted_email_validator_spec.rb
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
RSpec.describe BlacklistedEmailValidator, type: :validator do
|
||||||
|
describe '#validate' do
|
||||||
|
let(:user) { double(email: 'info@mail.com', errors: errors) }
|
||||||
|
let(:errors) { double(add: nil) }
|
||||||
|
|
||||||
|
before do
|
||||||
|
allow_any_instance_of(described_class).to receive(:blocked_email?) { blocked_email }
|
||||||
|
described_class.new.validate(user)
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'blocked_email?' do
|
||||||
|
let(:blocked_email) { true }
|
||||||
|
|
||||||
|
it 'calls errors.add' do
|
||||||
|
expect(errors).to have_received(:add).with(:email, I18n.t('users.invalid_email'))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context '!blocked_email?' do
|
||||||
|
let(:blocked_email) { false }
|
||||||
|
|
||||||
|
it 'not calls errors.add' do
|
||||||
|
expect(errors).not_to have_received(:add).with(:email, I18n.t('users.invalid_email'))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
Loading…
Reference in New Issue
Block a user