devise-security 0.16.0 → 0.18.0

data/test/test_paranoid_verification.rb

@@ -6,12 +6,12 @@ class TestParanoidVerification < ActiveSupport::TestCase
   test 'need to paranoid verify if code present' do
     user = User.new
     user.generate_paranoid_code
-    assert_equal(true, user.need_paranoid_verification?)
+    assert(user.need_paranoid_verification?)
   end
 
   test 'no need to paranoid verify if no code' do
     user = User.new
-    assert_equal(false, user.need_paranoid_verification?)
+    assert_not(user.need_paranoid_verification?)
   end
 
   test 'generate code' do
@@ -29,23 +29,23 @@ class TestParanoidVerification < ActiveSupport::TestCase
     user.generate_paranoid_code
     # default generator generates 5 char string
     assert_equal(user.paranoid_verification_code.class, String)
-    assert_equal(user.paranoid_verification_code.length, 5)
+    assert_equal(5, user.paranoid_verification_code.length)
   end
 
   test 'when code match upon verify code, should mark record that it\'s no loger needed to verify' do
     user = User.new(paranoid_verification_code: 'abcde')
 
-    assert_equal(true, user.need_paranoid_verification?)
+    assert(user.need_paranoid_verification?)
     user.verify_code('abcde')
-    assert_equal(false, user.need_paranoid_verification?)
+    assert_not(user.need_paranoid_verification?)
   end
 
   test 'when code match upon verify code, should no longer need verification' do
     user = User.new(paranoid_verification_code: 'abcde')
 
-    assert_equal(true, user.need_paranoid_verification?)
+    assert(user.need_paranoid_verification?)
     user.verify_code('abcde')
-    assert_equal(false, user.need_paranoid_verification?)
+    assert_not(user.need_paranoid_verification?)
   end
 
   test 'when code match upon verification code, should set when verification was accepted' do
@@ -57,7 +57,7 @@ class TestParanoidVerification < ActiveSupport::TestCase
   test 'when code not match upon verify code, should still need verification' do
     user = User.new(paranoid_verification_code: 'abcde')
     user.verify_code('wrong')
-    assert_equal(true, user.need_paranoid_verification?)
+    assert(user.need_paranoid_verification?)
   end
 
   test 'when code not match upon verification code, should not set paranoid_verified_at' do
@@ -94,7 +94,6 @@ class TestParanoidVerification < ActiveSupport::TestCase
     Devise.paranoid_code_regenerate_after_attempt = original_regenerate
   end
 
-
   test 'by default paranoid code regenerate should have 10 attempts' do
     user = User.new(paranoid_verification_code: 'abcde')
     assert_equal 10, user.paranoid_attempts_remaining

data/test/test_password_archivable.rb

@@ -3,7 +3,6 @@
 require 'test_helper'
 
 class TestPasswordArchivable < ActiveSupport::TestCase
-
   setup do
     Devise.password_archiving_count = 2
   end
@@ -20,7 +19,7 @@ class TestPasswordArchivable < ActiveSupport::TestCase
 
   test 'cannot use same password' do
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    assert_raises(ORMInvalidRecordException) { set_password(user,  'Password1') }
+    assert_raises(ORMInvalidRecordException) { set_password(user, 'Password1') }
   end
 
   test 'indirectly saving associated user does not cause deprecation warning' do
@@ -43,19 +42,19 @@ class TestPasswordArchivable < ActiveSupport::TestCase
 
     user = User.create! email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
     assert_equal 0, OldPassword.count
-    set_password(user,  'Password2')
+    set_password(user, 'Password2')
     assert_equal 1, OldPassword.count
 
-    assert_raises(ORMInvalidRecordException) { set_password(user,  'Password1') }
-    set_password(user,  'Password3')
+    assert_raises(ORMInvalidRecordException) { set_password(user, 'Password1') }
+    set_password(user, 'Password3')
     assert_equal 2, OldPassword.count
 
     # rotate first password out of archive
-    assert set_password(user,  'Password4')
+    assert set_password(user, 'Password4')
 
     # archive count was 2, so first password should work again
-    assert set_password(user,  'Password1')
-    assert set_password(user,  'Password2')
+    assert set_password(user, 'Password1')
+    assert set_password(user, 'Password2')
   end
 
   test 'the option should be dynamic during runtime' do
@@ -67,10 +66,34 @@ class TestPasswordArchivable < ActiveSupport::TestCase
 
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
 
-    assert set_password(user,  'Password2')
+    assert set_password(user, 'Password2')
+
+    assert_raises(ORMInvalidRecordException) { set_password(user, 'Password2') }
+
+    assert_raises(ORMInvalidRecordException) { set_password(user, 'Password1') }
+  end
+
+  test 'default sort orders do not affect archiving' do
+    class ::OldPassword
+      default_scope { order(created_at: :asc) }
+    end
+
+    assert_equal 2, Devise.password_archiving_count
+
+    user = User.create! email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
+    assert_equal 0, OldPassword.count
+    set_password(user, 'Password2')
+    assert_equal 1, OldPassword.count
+
+    assert_raises(ORMInvalidRecordException) { set_password(user, 'Password1') }
+    set_password(user, 'Password3')
+    assert_equal 2, OldPassword.count
 
-    assert_raises(ORMInvalidRecordException) { set_password(user,  'Password2') }
+    # rotate first password out of archive
+    assert set_password(user, 'Password4')
 
-    assert_raises(ORMInvalidRecordException) { set_password(user,  'Password1') }
+    # archive count was 2, so first password should work again
+    assert set_password(user, 'Password1')
+    assert set_password(user, 'Password2')
   end
 end

data/test/test_password_expirable.rb

@@ -14,59 +14,59 @@ class TestPasswordArchivable < ActiveSupport::TestCase
   test 'does nothing if disabled' do
     Devise.expire_password_after = false
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    refute user.need_change_password?
-    refute user.password_expired?
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
     user.need_change_password!
-    refute user.need_change_password?
-    refute user.password_expired?
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
   end
 
   test 'password change can be requested' do
     Devise.expire_password_after = true
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    refute user.need_change_password?
-    refute user.password_expired?
-    refute user.password_change_requested?
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
+    assert_not user.password_change_requested?
     user.need_change_password!
     assert user.need_change_password?
-    refute user.password_expired? # it's not too old because it's not set at all
+    assert_not user.password_expired? # it's not too old because it's not set at all
     assert user.password_change_requested?
   end
 
   test 'password expires' do
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    refute user.need_change_password?
-    refute user.password_expired?
-    refute user.password_too_old?
-    user.update(password_changed_at: Time.now.ago(3.months))
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
+    assert_not user.password_too_old?
+    user.update(password_changed_at: Time.zone.now.ago(3.months))
     assert user.password_too_old?
     assert user.need_change_password?
     assert user.password_expired?
-    refute user.password_change_requested?
+    assert_not user.password_change_requested?
   end
 
   test 'saving a record records the time the password was changed' do
     user = User.new email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    assert user.password_changed_at.nil?
-    refute user.password_change_requested?
-    refute user.password_expired?
+    assert_nil user.password_changed_at
+    assert_not user.password_change_requested?
+    assert_not user.password_expired?
     user.save
     assert user.password_changed_at.present?
-    refute user.password_change_requested?
-    refute user.password_expired?
+    assert_not user.password_change_requested?
+    assert_not user.password_expired?
   end
 
   test 'updating a record updates the time the password was changed if the password is changed' do
     user = User.create email: 'bob@microsoft.com', password: 'Password1', password_confirmation: 'Password1'
-    user.update(password_changed_at: Time.now.ago(3.months))
+    user.update(password_changed_at: Time.zone.now.ago(3.months))
     original_password_changed_at = user.password_changed_at
     user.expire_password!
     assert user.password_change_requested?
-    user.password = "NewPassword1"
-    user.password_confirmation = "NewPassword1"
+    user.password = 'NewPassword1'
+    user.password_confirmation = 'NewPassword1'
     user.save
     assert user.password_changed_at > original_password_changed_at
-    refute user.password_change_requested?
+    assert_not user.password_change_requested?
   end
 
   test 'updating a record does not updates the time the password was changed if the password was not changed' do
@@ -74,7 +74,7 @@ class TestPasswordArchivable < ActiveSupport::TestCase
     user.expire_password!
     assert user.password_change_requested?
     user.save
-    refute user.previous_changes.key?(:password_changed_at)
+    assert_not user.previous_changes.key?(:password_changed_at)
     assert user.password_change_requested?
   end
 
@@ -85,10 +85,10 @@ class TestPasswordArchivable < ActiveSupport::TestCase
         4.months
       end
     end
-    user.password_changed_at = Time.now.ago(3.months)
-    refute user.need_change_password?
-    refute user.password_expired?
-    user.password_changed_at = Time.now.ago(5.months)
+    user.password_changed_at = Time.zone.now.ago(3.months)
+    assert_not user.need_change_password?
+    assert_not user.password_expired?
+    user.password_changed_at = Time.zone.now.ago(5.months)
     assert user.need_change_password?
     assert user.password_expired?
   end