1
0
Fork 1
forked from fedi/mastodon

Add specs for UnreservedUsernameValidator (#9698)

* Add specs for UnreservedUsernameValidator

* Use instance variable
This commit is contained in:
ysksn 2019-01-03 13:10:02 +09:00 committed by Yamagishi Kazutoshi
parent 9790f3b590
commit 19abf4ef0b
2 changed files with 53 additions and 7 deletions

View file

@ -2,20 +2,22 @@
class UnreservedUsernameValidator < ActiveModel::Validator class UnreservedUsernameValidator < ActiveModel::Validator
def validate(account) def validate(account)
return if account.username.nil? @username = account.username
account.errors.add(:username, I18n.t('accounts.reserved_username')) if reserved_username?(account.username) return if @username.nil?
account.errors.add(:username, I18n.t('accounts.reserved_username')) if reserved_username?
end end
private private
def pam_controlled?(value) def pam_controlled?
return false unless Devise.pam_authentication && Devise.pam_controlled_service return false unless Devise.pam_authentication && Devise.pam_controlled_service
Rpam2.account(Devise.pam_controlled_service, value).present? Rpam2.account(Devise.pam_controlled_service, @username).present?
end end
def reserved_username?(value) def reserved_username?
return true if pam_controlled?(value) return true if pam_controlled?
return false unless Setting.reserved_usernames return false unless Setting.reserved_usernames
Setting.reserved_usernames.include?(value.downcase) Setting.reserved_usernames.include?(@username.downcase)
end end
end end

View file

@ -0,0 +1,44 @@
# frozen_string_literal: true
require 'rails_helper'
RSpec.describe UnreservedUsernameValidator, type: :validator do
describe '#validate' do
before do
allow(validator).to receive(:reserved_username?) { reserved_username }
validator.validate(account)
end
let(:validator) { described_class.new }
let(:account) { double(username: username, errors: errors) }
let(:errors ) { double(add: nil) }
context '@username.nil?' do
let(:username) { nil }
it 'not calls errors.add' do
expect(errors).not_to have_received(:add).with(:username, any_args)
end
end
context '!@username.nil?' do
let(:username) { '' }
context 'reserved_username?' do
let(:reserved_username) { true }
it 'calls erros.add' do
expect(errors).to have_received(:add).with(:username, I18n.t('accounts.reserved_username'))
end
end
context '!reserved_username?' do
let(:reserved_username) { false }
it 'not calls erros.add' do
expect(errors).not_to have_received(:add).with(:username, any_args)
end
end
end
end
end