about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorysksn <bluewhale1982@gmail.com>2019-01-03 13:10:02 +0900
committerYamagishi Kazutoshi <ykzts@desire.sh>2019-01-03 13:10:02 +0900
commit19abf4ef0bafb12c2c44ddf92f72354ec409e540 (patch)
tree5a1936d095f91b312caac8fc38c6f5c07200b9ff /app
parent9790f3b59061b5529c50d9f5c94f665e13315bfe (diff)
Add specs for UnreservedUsernameValidator (#9698)
* Add specs for UnreservedUsernameValidator

* Use instance variable
Diffstat (limited to 'app')
-rw-r--r--app/validators/unreserved_username_validator.rb16
1 files changed, 9 insertions, 7 deletions
diff --git a/app/validators/unreserved_username_validator.rb b/app/validators/unreserved_username_validator.rb
index c2311a89a..634ceb06e 100644
--- a/app/validators/unreserved_username_validator.rb
+++ b/app/validators/unreserved_username_validator.rb
@@ -2,20 +2,22 @@
 
 class UnreservedUsernameValidator < ActiveModel::Validator
   def validate(account)
-    return if account.username.nil?
-    account.errors.add(:username, I18n.t('accounts.reserved_username')) if reserved_username?(account.username)
+    @username = account.username
+    return if @username.nil?
+
+    account.errors.add(:username, I18n.t('accounts.reserved_username')) if reserved_username?
   end
 
   private
 
-  def pam_controlled?(value)
+  def pam_controlled?
     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
 
-  def reserved_username?(value)
-    return true if pam_controlled?(value)
+  def reserved_username?
+    return true if pam_controlled?
     return false unless Setting.reserved_usernames
-    Setting.reserved_usernames.include?(value.downcase)
+    Setting.reserved_usernames.include?(@username.downcase)
   end
 end