Fixed issue with PasswordStrength.enabled.

csb-ric · Aug 12, 2010 · 6570309 · 6570309
1 parent e7e4818
commit 6570309
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/lib/password_strength/active_record/ar2.rb b/lib/password_strength/active_record/ar2.rb
@@ -45,9 +45,11 @@ def validates_strength_of(*attr_names)
       raise ArgumentError, "The :level option must be one of [:weak, :good, :strong]" unless [:weak, :good, :strong].include?(options[:level])
 
       validates_each(attr_names, options) do |record, attr_name, value|
+        next unless PasswordStrength.enabled
+
         strength = options[:using].new(record.send(options[:with]), value, :exclude => options[:exclude])
         strength.test
-        record.errors.add(attr_name, :too_weak, options) unless PasswordStrength.enabled && strength.valid?(options[:level])
+        record.errors.add(attr_name, :too_weak, options) unless strength.valid?(options[:level])
       end
     end
   end

diff --git a/lib/password_strength/active_record/ar3.rb b/lib/password_strength/active_record/ar3.rb
@@ -6,6 +6,7 @@ def initialize(options)
       end
 
       def validate_each(record, attribute, value)
+        return unless PasswordStrength.enabled
         strength = options[:using].new(record.send(options[:with]), value, :exclude => options[:exclude])
         strength.test
         record.errors.add(attribute, :too_weak, options) unless PasswordStrength.enabled && strength.valid?(options[:level])

diff --git a/test/active_record_test.rb b/test/active_record_test.rb
@@ -76,6 +76,7 @@ def test_exclude_option
   end
 
   def test_ignore_validations_when_password_strength_is_disabled
+    User.validates_strength_of :password
     PasswordStrength.enabled = false
     @user.update_attributes :password => ""
     assert @user.valid?