authlogic 3.4.6 → 3.5.0

data/test/acts_as_authentic_test/magic_columns_test.rb

@@ -7,21 +7,21 @@ module ActsAsAuthenticTest
       u.login_count = -1
       assert !u.valid?
       assert u.errors[:login_count].size > 0
-      
+
       u.login_count = 0
       assert !u.valid?
       assert u.errors[:login_count].size == 0
     end
-    
+
     def test_validates_numericality_of_failed_login_count
       u = User.new
       u.failed_login_count = -1
       assert !u.valid?
       assert u.errors[:failed_login_count].size > 0
-      
+
       u.failed_login_count = 0
       assert !u.valid?
       assert u.errors[:failed_login_count].size == 0
     end
   end
-end
+end

data/test/acts_as_authentic_test/password_test.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 module ActsAsAuthenticTest
   class PasswordTest < ActiveSupport::TestCase
+    i_suck_and_my_tests_are_order_dependent! # If test_human_name is executed after test_i18n_of_human_name the test will fail.
     def test_crypted_password_field_config
       assert_equal :crypted_password, User.crypted_password_field
       assert_equal :crypted_password, Employee.crypted_password_field
@@ -51,34 +52,34 @@ module ActsAsAuthenticTest
     end
 
     def test_validates_length_of_password_field_options_config
-      default = {:minimum => 4, :if => :require_password?}
+      default = { :minimum => 8, :if => :require_password? }
       assert_equal default, User.validates_length_of_password_field_options
       assert_equal default, Employee.validates_length_of_password_field_options
 
-      User.validates_length_of_password_field_options = {:yes => "no"}
-      assert_equal({:yes => "no"}, User.validates_length_of_password_field_options)
+      User.validates_length_of_password_field_options = { :yes => "no" }
+      assert_equal({ :yes => "no" }, User.validates_length_of_password_field_options)
       User.validates_length_of_password_field_options default
       assert_equal default, User.validates_length_of_password_field_options
     end
 
     def test_validates_confirmation_of_password_field_options_config
-      default = {:if => :require_password?}
+      default = { :if => :require_password? }
       assert_equal default, User.validates_confirmation_of_password_field_options
       assert_equal default, Employee.validates_confirmation_of_password_field_options
 
-      User.validates_confirmation_of_password_field_options = {:yes => "no"}
-      assert_equal({:yes => "no"}, User.validates_confirmation_of_password_field_options)
+      User.validates_confirmation_of_password_field_options = { :yes => "no" }
+      assert_equal({ :yes => "no" }, User.validates_confirmation_of_password_field_options)
       User.validates_confirmation_of_password_field_options default
       assert_equal default, User.validates_confirmation_of_password_field_options
     end
 
     def test_validates_length_of_password_confirmation_field_options_config
-      default = {:minimum => 4, :if => :require_password?}
+      default = { :minimum => 8, :if => :require_password? }
       assert_equal default, User.validates_length_of_password_confirmation_field_options
       assert_equal default, Employee.validates_length_of_password_confirmation_field_options
 
-      User.validates_length_of_password_confirmation_field_options = {:yes => "no"}
-      assert_equal({:yes => "no"}, User.validates_length_of_password_confirmation_field_options)
+      User.validates_length_of_password_confirmation_field_options = { :yes => "no" }
+      assert_equal({ :yes => "no" }, User.validates_length_of_password_confirmation_field_options)
       User.validates_length_of_password_confirmation_field_options default
       assert_equal default, User.validates_length_of_password_confirmation_field_options
     end
@@ -104,21 +105,21 @@ module ActsAsAuthenticTest
     end
 
     def test_validates_length_of_password
-      u = User.new(login: "abcde", email: "abcde@test.com", password: "abcde", password_confirmation: "abcde")
+      u = User.new(login: "abcde", email: "abcde@test.com", password: "abcdefgh", password_confirmation: "abcdefgh")
       assert u.valid?
 
-      u.password = u.password_confirmation = "abc"
+      u.password = u.password_confirmation = "abcdef"
       assert !u.valid?
 
-      assert u.errors[:password].include?("is too short (minimum is 4 characters)")
-      assert u.errors[:password_confirmation].include?("is too short (minimum is 4 characters)")
+      assert u.errors[:password].include?("is too short (minimum is 8 characters)")
+      assert u.errors[:password_confirmation].include?("is too short (minimum is 8 characters)")
     end
 
     def test_validates_confirmation_of_password
-      u = User.new(login: "abcde", email: "abcde@test.com", password: "abcde", password_confirmation: "abcde")
+      u = User.new(login: "abcde", email: "abcde@test.com", password: "abcdefgh", password_confirmation: "abcdefgh")
       assert u.valid?
 
-      u.password_confirmation = "abcdefgh"
+      u.password_confirmation = "abcdefghij"
       assert !u.valid?
 
       if ActiveModel.respond_to?(:version) and ActiveModel.version.segments.first >= 4
@@ -131,23 +132,23 @@ module ActsAsAuthenticTest
     def test_validates_length_of_password_confirmation
       u = User.new
 
-      u.password = "test"
+      u.password = "testpass"
       u.password_confirmation = ""
       assert !u.valid?
       assert u.errors[:password_confirmation].size > 0
 
-      u.password_confirmation = "test"
+      u.password_confirmation = "testpass"
       assert !u.valid?
       assert u.errors[:password_confirmation].size == 0
 
       ben = users(:ben)
       assert ben.valid?
 
-      ben.password = "newpass"
+      ben.password = "newpasswd"
       assert !ben.valid?
       assert ben.errors[:password_confirmation].size > 0
 
-      ben.password_confirmation = "newpass"
+      ben.password_confirmation = "newpasswd"
       assert ben.valid?
     end
 
@@ -164,8 +165,16 @@ module ActsAsAuthenticTest
       ben = users(:ben)
 
       transition_password_to(Authlogic::CryptoProviders::BCrypt, ben)
-      transition_password_to(Authlogic::CryptoProviders::Sha1, ben, [Authlogic::CryptoProviders::Sha512, Authlogic::CryptoProviders::BCrypt])
-      transition_password_to(Authlogic::CryptoProviders::Sha512, ben, [Authlogic::CryptoProviders::Sha1, Authlogic::CryptoProviders::BCrypt])
+      transition_password_to(
+        Authlogic::CryptoProviders::Sha1,
+        ben,
+        [Authlogic::CryptoProviders::Sha512, Authlogic::CryptoProviders::BCrypt]
+      )
+      transition_password_to(
+        Authlogic::CryptoProviders::Sha512,
+        ben,
+        [Authlogic::CryptoProviders::Sha1, Authlogic::CryptoProviders::BCrypt]
+      )
     end
 
     def test_checks_password_against_database
@@ -215,6 +224,7 @@ module ActsAsAuthenticTest
     end
 
     private
+
       def transition_password_to(crypto_provider, records, from_crypto_providers = Authlogic::CryptoProviders::Sha512)
         records = [records] unless records.is_a?(Array)
         User.acts_as_authentic do |c|

data/test/acts_as_authentic_test/perishable_token_test.rb

@@ -5,73 +5,73 @@ module ActsAsAuthenticTest
     def test_perishable_token_valid_for_config
       assert_equal 10.minutes.to_i, User.perishable_token_valid_for
       assert_equal 10.minutes.to_i, Employee.perishable_token_valid_for
-      
+
       User.perishable_token_valid_for = 1.hour
       assert_equal 1.hour.to_i, User.perishable_token_valid_for
       User.perishable_token_valid_for 10.minutes
       assert_equal 10.minutes.to_i, User.perishable_token_valid_for
     end
-    
+
     def test_disable_perishable_token_maintenance_config
       assert !User.disable_perishable_token_maintenance
       assert !Employee.disable_perishable_token_maintenance
-      
+
       User.disable_perishable_token_maintenance = true
       assert User.disable_perishable_token_maintenance
       User.disable_perishable_token_maintenance false
       assert !User.disable_perishable_token_maintenance
     end
-    
+
     def test_validates_uniqueness_of_perishable_token
       u = User.new
       u.perishable_token = users(:ben).perishable_token
       assert !u.valid?
       assert u.errors[:perishable_token].size > 0
     end
-    
+
     def test_before_save_reset_perishable_token
       ben = users(:ben)
       old_perishable_token = ben.perishable_token
       assert ben.save
       assert_not_equal old_perishable_token, ben.perishable_token
     end
-    
+
     def test_reset_perishable_token
       ben = users(:ben)
       old_perishable_token = ben.perishable_token
-      
+
       assert ben.reset_perishable_token
       assert_not_equal old_perishable_token, ben.perishable_token
-      
+
       ben.reload
       assert_equal old_perishable_token, ben.perishable_token
-      
+
       assert ben.reset_perishable_token!
       assert_not_equal old_perishable_token, ben.perishable_token
-      
+
       ben.reload
       assert_not_equal old_perishable_token, ben.perishable_token
     end
-    
+
     def test_find_using_perishable_token
       ben = users(:ben)
       assert_equal ben, User.find_using_perishable_token(ben.perishable_token)
     end
-    
+
     def test_find_using_perishable_token_when_perished
       ben = users(:ben)
       ActiveRecord::Base.connection.execute("UPDATE users set updated_at = '#{1.week.ago.to_s(:db)}' where id = #{ben.id}")
       assert_nil User.find_using_perishable_token(ben.perishable_token)
     end
-    
-    def test_find_using_perishable_token_when_perished
+
+    def test_find_using_perishable_token_when_perished_2
       User.perishable_token_valid_for = 1.minute
       ben = users(:ben)
       ActiveRecord::Base.connection.execute("UPDATE users set updated_at = '#{2.minutes.ago.to_s(:db)}' where id = #{ben.id}")
       assert_nil User.find_using_perishable_token(ben.perishable_token)
       User.perishable_token_valid_for = 10.minutes
     end
-    
+
     def test_find_using_perishable_token_when_passing_threshold
       User.perishable_token_valid_for = 1.minute
       ben = users(:ben)

data/test/acts_as_authentic_test/session_maintenance_test.rb

@@ -9,17 +9,24 @@ module ActsAsAuthenticTest
       User.maintain_sessions true
       assert User.maintain_sessions
     end
-    
+
     def test_login_after_create
-      assert User.create(:login => "awesome", :password => "saweet", :password_confirmation => "saweet", :email => "awesome@awesome.com")
+      assert(
+        User.create(
+          :login => "awesome",
+          :password => "saweeeet",
+          :password_confirmation => "saweeeet",
+          :email => "awesome@awesome.com"
+        )
+      )
       assert UserSession.find
     end
-    
+
     def test_updating_session_with_failed_magic_state
       ben = users(:ben)
       ben.confirmed = false
-      ben.password = "newpass"
-      ben.password_confirmation = "newpass"
+      ben.password = "newpasswd"
+      ben.password_confirmation = "newpasswd"
       assert ben.save
     end
 
@@ -28,8 +35,8 @@ module ActsAsAuthenticTest
       UserSession.create(ben)
       old_session_key = controller.session["user_credentials"]
       old_cookie_key = controller.cookies["user_credentials"]
-      ben.password = "newpass"
-      ben.password_confirmation = "newpass"
+      ben.password = "newpasswd"
+      ben.password_confirmation = "newpasswd"
       assert ben.save
       assert controller.session["user_credentials"]
       assert controller.cookies["user_credentials"]
@@ -47,7 +54,7 @@ module ActsAsAuthenticTest
       assert_equal controller.session["user_credentials"], old_session_key
       assert_equal controller.cookies["user_credentials"], old_cookie_key
     end
-    
+
     def test_creating_other_user
       ben = users(:ben)
       UserSession.create(ben)
@@ -64,8 +71,8 @@ module ActsAsAuthenticTest
       old_session_key = controller.session["user_credentials"]
       old_cookie_key = controller.cookies["user_credentials"]
       zack = users(:zack)
-      zack.password = "newpass"
-      zack.password_confirmation = "newpass"
+      zack.password = "newpasswd"
+      zack.password_confirmation = "newpasswd"
       assert zack.save
       assert_equal controller.session["user_credentials"], old_session_key
       assert_equal controller.cookies["user_credentials"], old_cookie_key
@@ -74,11 +81,11 @@ module ActsAsAuthenticTest
     def test_resetting_password_when_logged_out
       ben = users(:ben)
       assert !UserSession.find
-      ben.password = "newpass"
-      ben.password_confirmation = "newpass"
+      ben.password = "newpasswd"
+      ben.password_confirmation = "newpasswd"
       assert ben.save
       assert UserSession.find
       assert_equal ben, UserSession.find.record
     end
   end
-end
+end

data/test/acts_as_authentic_test/single_access_test.rb

@@ -5,40 +5,40 @@ module ActsAsAuthenticTest
     def test_change_single_access_token_with_password_config
       assert !User.change_single_access_token_with_password
       assert !Employee.change_single_access_token_with_password
-      
+
       User.change_single_access_token_with_password = true
       assert User.change_single_access_token_with_password
       User.change_single_access_token_with_password false
       assert !User.change_single_access_token_with_password
     end
-    
+
     def test_validates_uniqueness_of_single_access_token
       u = User.new
       u.single_access_token = users(:ben).single_access_token
       assert !u.valid?
       assert u.errors[:single_access_token].size > 0
     end
-    
+
     def test_before_validation_reset_single_access_token
       u = User.new
       assert !u.valid?
       assert_not_nil u.single_access_token
     end
-    
+
     def test_after_password_set_reset_single_access_token
       User.change_single_access_token_with_password = true
-      
+
       ben = users(:ben)
       old_single_access_token = ben.single_access_token
       ben.password = "new_pass"
       assert_not_equal old_single_access_token, ben.single_access_token
-      
+
       User.change_single_access_token_with_password = false
     end
-    
+
     def test_after_password_set_is_not_called
       ldaper = Ldaper.new
       assert ldaper.save
     end
   end
-end
+end

data/test/authenticates_many_test.rb

@@ -6,11 +6,11 @@ class AuthenticatesManyTest < ActiveSupport::TestCase
     ben = users(:ben)
     binary_logic = companies(:binary_logic)
     set_session_for(zack)
-    
+
     assert !binary_logic.user_sessions.find
-    
+
     set_session_for(ben)
-    
+
     assert binary_logic.user_sessions.find
   end
-end
+end

data/test/crypto_provider_test/aes256_test.rb

@@ -5,10 +5,10 @@ module CryptoProviderTest
     def test_encrypt
       assert Authlogic::CryptoProviders::AES256.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::AES256.encrypt("mypass")
       assert Authlogic::CryptoProviders::AES256.matches?(hash, "mypass")
     end
   end
-end
+end

data/test/crypto_provider_test/scrypt_test.rb

@@ -5,7 +5,7 @@ module CryptoProviderTest
     def test_encrypt
       assert Authlogic::CryptoProviders::SCrypt.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::SCrypt.encrypt("mypass")
       assert Authlogic::CryptoProviders::SCrypt.matches?(hash, "mypass")

data/test/crypto_provider_test/sha1_test.rb

@@ -5,12 +5,12 @@ module CryptoProviderTest
     def test_encrypt
       assert Authlogic::CryptoProviders::Sha1.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::Sha1.encrypt("mypass")
       assert Authlogic::CryptoProviders::Sha1.matches?(hash, "mypass")
     end
-    
+
     def test_old_restful_authentication_passwords
       password = "test"
       salt = "7e3041ebc2fc05a40c60028e2c4901a81035d3cd"
@@ -20,4 +20,4 @@ module CryptoProviderTest
       Authlogic::CryptoProviders::Sha1.stretches = 10
     end
   end
-end
+end

data/test/crypto_provider_test/sha256_test.rb

@@ -5,7 +5,7 @@ module CryptoProviderTest
     def test_encrypt
       assert Authlogic::CryptoProviders::Sha256.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::Sha256.encrypt("mypass")
       assert Authlogic::CryptoProviders::Sha256.matches?(hash, "mypass")

data/test/crypto_provider_test/sha512_test.rb

@@ -5,10 +5,10 @@ module CryptoProviderTest
     def test_encrypt
       assert Authlogic::CryptoProviders::Sha512.encrypt("mypass")
     end
-    
+
     def test_matches
       hash = Authlogic::CryptoProviders::Sha512.encrypt("mypass")
       assert Authlogic::CryptoProviders::Sha512.matches?(hash, "mypass")
     end
   end
-end
+end