Extract complexity in ChangeEmailValidator

Add some private methods to add more semantics to conditionals

1 files changed, 10 insertions, 2 deletions

diff --git a/app/models/change_email_validator.rb b/app/models/change_email_validator.rb
index b6708640f..7ee6654bb 100644
--- a/app/models/change_email_validator.rb
+++ b/app/models/change_email_validator.rb
@@ -41,9 +41,9 @@ class ChangeEmailValidator
         check_email_is_present_and_valid(:old_email)
 
         if errors[:old_email].blank?
-            if old_email.downcase != logged_in_user.email.downcase
+            if !email_belongs_to_user?(old_email)
                 errors.add(:old_email, _("Old email address isn't the same as the address of the account you are logged in with"))
-            elsif (!changing_email) && (!logged_in_user.has_this_password?(password))
+            elsif !changing_email && !correct_password?
                 if errors[:password].blank?
                     errors.add(:password, _("Password is not correct"))
                 end
@@ -59,4 +59,12 @@ class ChangeEmailValidator
         end
     end
 
+    def email_belongs_to_user?(email)
+        email.downcase == logged_in_user.email.downcase
+    end
+
+    def correct_password?
+        logged_in_user.has_this_password?(password)
+    end
+
 end