authlogic 3.4.6 → 3.5.0

data/test/gemfiles/Gemfile.rails-3.2.x

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 gemspec :path => "./../.."
 
-gem "activerecord", "3.2.17"
-gem "activesupport", "3.2.17"
+gem "activerecord", "3.2.22"
+gem "activesupport", "3.2.22"
 gem 'activerecord-jdbcsqlite3-adapter', :platforms => :jruby
 gem 'sqlite3', :platforms => :ruby

data/test/gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+gemspec :path => "./../.."
+
+gem "activerecord", "~> 5.0.0"
+gem "activesupport", "~> 5.0.0"
+gem 'sqlite3', :platforms => :ruby

data/test/i18n_test.rb

@@ -4,20 +4,20 @@ class I18nTest < ActiveSupport::TestCase
   def test_uses_authlogic_as_scope_by_default
     assert_equal :authlogic, Authlogic::I18n.scope
   end
-  
+
   def test_can_set_scope
     assert_nothing_raised { Authlogic::I18n.scope = [:a, :b] }
     assert_equal [:a, :b], Authlogic::I18n.scope
     Authlogic::I18n.scope = :authlogic
   end
-  
+
   def test_uses_built_in_translator_by_default
     assert_equal Authlogic::I18n::Translator, Authlogic::I18n.translator.class
   end
-  
+
   def test_can_set_custom_translator
     old_translator = Authlogic::I18n.translator
-    
+
     assert_nothing_raised do
       Authlogic::I18n.translator = Class.new do
         def translate(key, options = {})
@@ -27,7 +27,7 @@ class I18nTest < ActiveSupport::TestCase
     end
 
     assert_equal "Translated: x", Authlogic::I18n.translate(:x)
-    
+
     Authlogic::I18n.translator = old_translator
   end
 end

data/test/libs/affiliate.rb

@@ -2,6 +2,6 @@ class Affiliate < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypted_password_field = :pw_hash
   end
-  
+
   belongs_to :company
-end
+end

data/test/libs/company.rb

@@ -3,4 +3,4 @@ class Company < ActiveRecord::Base
   authenticates_many :user_sessions
   has_many :employees, :dependent => :destroy
   has_many :users, :dependent => :destroy
-end
+end

data/test/libs/employee.rb

@@ -2,6 +2,6 @@ class Employee < ActiveRecord::Base
   acts_as_authentic do |c|
     c.crypto_provider Authlogic::CryptoProviders::AES256
   end
-  
+
   belongs_to :company
-end
+end

data/test/libs/employee_session.rb

@@ -1,2 +1,2 @@
 class EmployeeSession < Authlogic::Session::Base
-end
+end

data/test/libs/ldaper.rb

@@ -1,3 +1,3 @@
 class Ldaper < ActiveRecord::Base
   acts_as_authentic
-end
+end

data/test/libs/project.rb

@@ -1,3 +1,3 @@
 class Project < ActiveRecord::Base
   has_and_belongs_to_many :users
-end
+end

data/test/random_test.rb

@@ -10,17 +10,18 @@ class RandomTest < ActiveSupport::TestCase
   end
 
   private
+
     def with_any_random(&block)
-      [true, false].each {|val| with_secure_random_enabled(val, &block)}
+      [true, false].each { |val| with_secure_random_enabled(val, &block) }
     end
 
     def with_secure_random_enabled(enabled = true)
       # can't really test SecureRandom if we don't have an implementation
       return if enabled && !Authlogic::Random::SecureRandom
-    
+
       current_sec_rand = Authlogic::Random::SecureRandom
       reload_authlogic_with_sec_random!(current_sec_rand, enabled)
-  
+
       yield
     ensure
       reload_authlogic_with_sec_random!(current_sec_rand)
@@ -39,4 +40,4 @@ class RandomTest < ActiveSupport::TestCase
     ensure
       $VERBOSE = old_verbose
     end
-end
+end

data/test/session_test/activation_test.rb

@@ -8,7 +8,7 @@ module SessionTest
         Authlogic::Session::Base.controller = nil
         assert !UserSession.activated?
       end
-    
+
       def test_controller
         Authlogic::Session::Base.controller = nil
         assert_nil Authlogic::Session::Base.controller
@@ -20,18 +20,18 @@ module SessionTest
         thread1.join
 
         assert_nil Authlogic::Session::Base.controller
-      
+
         thread2 = Thread.new do
           controller = MockController.new
           Authlogic::Session::Base.controller = controller
           assert_equal controller, Authlogic::Session::Base.controller
         end
         thread2.join
-      
+
         assert_nil Authlogic::Session::Base.controller
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_init
         UserSession.controller = nil
@@ -40,4 +40,4 @@ module SessionTest
       end
     end
   end
-end
+end

data/test/session_test/active_record_trickery_test.rb

@@ -3,6 +3,8 @@ require 'test_helper'
 module SessionTest
   module ActiveRecordTrickeryTest
     class ClassMethodsTest < 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_human_attribute_name
         assert_equal "Some attribute", UserSession.human_attribute_name("some_attribute")
         assert_equal "Some attribute", UserSession.human_attribute_name(:some_attribute)
@@ -13,12 +15,12 @@ module SessionTest
       end
 
       def test_i18n_of_human_name
-        I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } }
+        I18n.backend.store_translations 'en', :authlogic => { :models => { :user_session => "MySession" } }
         assert_equal "MySession", UserSession.human_name
       end
 
       def test_i18n_of_model_name_human
-        I18n.backend.store_translations 'en', :authlogic => {:models => {:user_session => "MySession" } }
+        I18n.backend.store_translations 'en', :authlogic => { :models => { :user_session => "MySession" } }
         assert_equal "MySession", UserSession.model_name.human
       end
 
@@ -47,18 +49,18 @@ module SessionTest
 
       def test_persisted
         session = UserSession.new(users(:ben))
-        assert ! session.persisted?
+        assert !session.persisted?
 
         session.save
         assert session.persisted?
 
         session.destroy
-        assert ! session.persisted?
+        assert !session.persisted?
       end
 
       def test_destroyed?
         session = UserSession.create(users(:ben))
-        assert ! session.destroyed?
+        assert !session.destroyed?
 
         session.destroy
         assert session.destroyed?

data/test/session_test/cookies_test.rb

@@ -82,7 +82,7 @@ module SessionTest
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_credentials
         session = UserSession.new
-        session.credentials = {:remember_me => true}
+        session.credentials = { :remember_me => true }
         assert_equal true, session.remember_me
       end
 
@@ -170,11 +170,13 @@ module SessionTest
       end
 
       def test_after_save_save_cookie_with_remember_me
-        ben = users(:ben)
-        session = UserSession.new(ben)
-        session.remember_me = true
-        assert session.save
-        assert_equal "#{ben.persistence_token}::#{ben.id}::#{session.remember_me_until.iso8601}", controller.cookies["user_credentials"]
+        Timecop.freeze do
+          ben = users(:ben)
+          session = UserSession.new(ben)
+          session.remember_me = true
+          assert session.save
+          assert_equal "#{ben.persistence_token}::#{ben.id}::#{session.remember_me_until.iso8601}", controller.cookies["user_credentials"]
+        end
       end
 
       def test_after_destroy_destroy_cookie

data/test/session_test/existence_test.rb

@@ -6,30 +6,36 @@ module SessionTest
       def test_create
         ben = users(:ben)
         assert UserSession.create(:login => "somelogin", :password => "badpw2").new_session?
-        assert !UserSession.create(:login => ben.login, :password => "benrocks").new_session?
-        assert_raise(Authlogic::Session::Existence::SessionInvalidError) { UserSession.create!(:login => ben.login, :password => "badpw") }
-        assert !UserSession.create!(:login => ben.login, :password => "benrocks").new_session?
+        refute UserSession.create(:login => ben.login, :password => "benrocks").new_session?
+      end
+
+      def test_create_bang
+        ben = users(:ben)
+        err = assert_raise(Authlogic::Session::Existence::SessionInvalidError) do
+          UserSession.create!(:login => ben.login, :password => "badpw")
+        end
+        assert_includes err.message, "Password is not valid"
+        refute UserSession.create!(:login => ben.login, :password => "benrocks").new_session?
       end
     end
-    
-    class IsntaceMethodsTest < ActiveSupport::TestCase
+
+    class InstanceMethodsTest < ActiveSupport::TestCase
       def test_new_session
         session = UserSession.new
         assert session.new_session?
-      
+
         set_session_for(users(:ben))
         session = UserSession.find
         assert !session.new_session?
       end
-    
+
       def test_save_with_nothing
         session = UserSession.new
         assert !session.save
         assert session.new_session?
       end
-    
+
       def test_save_with_block
-        ben = users(:ben)
         session = UserSession.new
         block_result = session.save do |result|
           assert !result
@@ -37,15 +43,15 @@ module SessionTest
         assert !block_result
         assert session.new_session?
       end
-    
+
       def test_save_with_bang
         session = UserSession.new
         assert_raise(Authlogic::Session::Existence::SessionInvalidError) { session.save! }
-      
+
         session.unauthorized_record = users(:ben)
         assert_nothing_raised { session.save! }
       end
-    
+
       def test_destroy
         ben = users(:ben)
         session = UserSession.new
@@ -61,4 +67,4 @@ module SessionTest
       end
     end
   end
-end
+end

data/test/session_test/http_auth_test.rb

@@ -20,10 +20,7 @@ module SessionTest
       end
 
       def test_http_basic_auth_realm
-        original_http_basic_auth_realm = UserSession.http_basic_auth_realm
-
         assert_equal 'Application', UserSession.http_basic_auth_realm
-
         UserSession.http_basic_auth_realm = 'TestRealm'
         assert_equal 'TestRealm', UserSession.http_basic_auth_realm
       end

data/test/session_test/id_test.rb

@@ -7,11 +7,11 @@ module SessionTest
       session.credentials = [:my_id]
       assert_equal :my_id, session.id
     end
-      
+
     def test_id
       session = UserSession.new
       session.id = :my_id
       assert_equal :my_id, session.id
     end
   end
-end
+end

data/test/session_test/klass_test.rb

@@ -37,4 +37,4 @@ module SessionTest
       end
     end
   end
-end
+end

data/test/session_test/magic_columns_test.rb

@@ -41,10 +41,7 @@ module SessionTest
 
         # grab old values
         old_login_count = aaron.login_count
-        old_failed_login_count = aaron.failed_login_count
-        old_last_login_at = aaron.last_login_at
         old_current_login_at = aaron.current_login_at
-        old_last_login_ip = aaron.last_login_ip
         old_current_login_ip = aaron.current_login_ip
 
         assert UserSession.create(:login => aaron.login, :password => "aaronrocks").valid?

data/test/session_test/magic_states_test.rb

@@ -6,55 +6,55 @@ module SessionTest
       def test_disable_magic_states_config
         UserSession.disable_magic_states = true
         assert_equal true, UserSession.disable_magic_states
-    
+
         UserSession.disable_magic_states false
         assert_equal false, UserSession.disable_magic_states
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_disabling_magic_states
         UserSession.disable_magic_states = true
-      
+
         ben = users(:ben)
         ben.update_attribute(:active, false)
         assert UserSession.create(ben)
-      
+
         UserSession.disable_magic_states = false
       end
-    
+
       def test_validate_validate_magic_states_active
         session = UserSession.new
         ben = users(:ben)
         session.unauthorized_record = ben
         assert session.valid?
-      
+
         ben.update_attribute(:active, false)
         assert !session.valid?
         assert session.errors[:base].size > 0
       end
-    
+
       def test_validate_validate_magic_states_approved
         session = UserSession.new
         ben = users(:ben)
         session.unauthorized_record = ben
         assert session.valid?
-      
+
         ben.update_attribute(:approved, false)
         assert !session.valid?
         assert session.errors[:base].size > 0
       end
-    
+
       def test_validate_validate_magic_states_confirmed
         session = UserSession.new
         ben = users(:ben)
         session.unauthorized_record = ben
         assert session.valid?
-      
+
         ben.update_attribute(:confirmed, false)
         assert !session.valid?
         assert session.errors[:base].size > 0
       end
     end
   end
-end
+end

data/test/session_test/params_test.rb

@@ -6,43 +6,43 @@ module SessionTest
       def test_params_key
         UserSession.params_key = "my_params_key"
         assert_equal "my_params_key", UserSession.params_key
-    
+
         UserSession.params_key "user_credentials"
         assert_equal "user_credentials", UserSession.params_key
       end
-    
+
       def test_single_access_allowed_request_types
         UserSession.single_access_allowed_request_types = ["my request type"]
         assert_equal ["my request type"], UserSession.single_access_allowed_request_types
-    
+
         UserSession.single_access_allowed_request_types ["application/rss+xml", "application/atom+xml"]
         assert_equal ["application/rss+xml", "application/atom+xml"], UserSession.single_access_allowed_request_types
       end
     end
-    
+
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_persist_persist_by_params
         ben = users(:ben)
         session = UserSession.new
-    
+
         assert !session.persisting?
         set_params_for(ben)
-      
+
         assert !session.persisting?
         assert !session.unauthorized_record
         assert !session.record
         assert_nil controller.session["user_credentials"]
-      
+
         set_request_content_type("text/plain")
         assert !session.persisting?
         assert !session.unauthorized_record
         assert_nil controller.session["user_credentials"]
-      
+
         set_request_content_type("application/atom+xml")
         assert session.persisting?
         assert_equal ben, session.record
         assert_nil controller.session["user_credentials"] # should not persist since this is single access
-      
+
         set_request_content_type("application/rss+xml")
         assert session.persisting?
         assert_equal ben, session.unauthorized_record
@@ -50,4 +50,4 @@ module SessionTest
       end
     end
   end
-end
+end