authlogic 3.4.6 → 4.2.0

data/test/session_test/foundation_test.rb

@@ -1,6 +1,22 @@
-require 'test_helper'
+require "test_helper"
+
+# We forbid the use of AC::Parameters, and we have a test to that effect, but we
+# do not want a development dependency on `actionpack`, so we define it here.
+module ActionController
+  class Parameters; end
+end
 
 module SessionTest
   class FoundationTest < ActiveSupport::TestCase
+    def test_credentials_raise_if_not_a_hash
+      session = UserSession.new
+      e = assert_raises(TypeError) {
+        session.credentials = ActionController::Parameters.new
+      }
+      assert_equal(
+        ::Authlogic::Session::Foundation::InstanceMethods::E_AC_PARAMETERS,
+        e.message
+      )
+    end
   end
 end

data/test/session_test/http_auth_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   class HttpAuthTest < ActiveSupport::TestCase
-    class ConfiTest < ActiveSupport::TestCase
+    class ConfigTest < ActiveSupport::TestCase
       def test_allow_http_basic_auth
         UserSession.allow_http_basic_auth = false
         assert_equal false, UserSession.allow_http_basic_auth
@@ -20,37 +20,36 @@ 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
+        assert_equal "Application", UserSession.http_basic_auth_realm
+        UserSession.http_basic_auth_realm = "TestRealm"
+        assert_equal "TestRealm", UserSession.http_basic_auth_realm
       end
     end
 
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_persist_persist_by_http_auth
+        UserSession.allow_http_basic_auth = true
+
         aaron = users(:aaron)
         http_basic_auth_for do
-          assert !UserSession.find
+          refute UserSession.find
         end
         http_basic_auth_for(aaron) do
           assert session = UserSession.find
           assert_equal aaron, session.record
           assert_equal aaron.login, session.login
           assert_equal "aaronrocks", session.send(:protected_password)
-          assert !controller.http_auth_requested?
+          refute controller.http_auth_requested?
         end
         unset_session
         UserSession.request_http_basic_auth = true
-        UserSession.http_basic_auth_realm = 'PersistTestRealm'
+        UserSession.http_basic_auth_realm = "PersistTestRealm"
         http_basic_auth_for(aaron) do
           assert session = UserSession.find
           assert_equal aaron, session.record
           assert_equal aaron.login, session.login
           assert_equal "aaronrocks", session.send(:protected_password)
-          assert_equal 'PersistTestRealm', controller.realm
+          assert_equal "PersistTestRealm", controller.realm
           assert controller.http_auth_requested?
         end
       end

data/test/session_test/id_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   class IdTest < ActiveSupport::TestCase
@@ -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

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   module KlassTest
@@ -37,4 +37,4 @@ module SessionTest
       end
     end
   end
-end
+end

data/test/session_test/magic_columns_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   module MagicColumnsTest
@@ -15,7 +15,7 @@ module SessionTest
     class InstanceMethodsTest < ActiveSupport::TestCase
       def test_after_persisting_set_last_request_at
         ben = users(:ben)
-        assert !UserSession.create(ben).new_session?
+        refute UserSession.create(ben).new_session?
 
         set_cookie_for(ben)
         old_last_request_at = ben.last_request_at
@@ -27,7 +27,8 @@ module SessionTest
       def test_valid_increase_failed_login_count
         ben = users(:ben)
         old_failed_login_count = ben.failed_login_count
-        assert UserSession.create(:login => ben.login, :password => "wrong").new_session?
+        session = UserSession.create(login: ben.login, password: "wrong")
+        assert session.new_session?
         ben.reload
         assert_equal old_failed_login_count + 1, ben.failed_login_count
       end
@@ -36,25 +37,22 @@ module SessionTest
         aaron = users(:aaron)
 
         # increase failed login count
-        assert UserSession.create(:login => aaron.login, :password => "wrong").new_session?
+        session = UserSession.create(login: aaron.login, password: "wrong")
+        assert session.new_session?
         aaron.reload
+        assert_equal 0, aaron.login_count
+        assert_nil aaron.current_login_at
+        assert_nil aaron.current_login_ip
 
-        # 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?
+        session = UserSession.create(login: aaron.login, password: "aaronrocks")
+        assert session.valid?
 
         aaron.reload
-        assert_equal old_login_count + 1, aaron.login_count
+        assert_equal 1, aaron.login_count
         assert_equal 0, aaron.failed_login_count
-        assert_equal old_current_login_at, aaron.last_login_at
-        assert aaron.current_login_at != old_current_login_at
-        assert_equal old_current_login_ip, aaron.last_login_ip
+        assert_nil aaron.last_login_at
+        assert_not_nil aaron.current_login_at
+        assert_nil aaron.last_login_ip
         assert_equal "1.1.1.1", aaron.current_login_ip
       end
     end

data/test/session_test/magic_states_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   module SessionTest
@@ -6,55 +6,53 @@ 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)
-      
+        refute UserSession.create(ben).new_session?
         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
+        refute session.valid?
+        refute session.errors[:base].empty?
       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
+        refute session.valid?
+        refute session.errors[:base].empty?
       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
+        refute session.valid?
+        refute session.errors[:base].empty?
       end
     end
   end
-end
+end

data/test/session_test/params_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   module ParamsTest
@@ -6,43 +6,49 @@ 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
+        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?
+
+        refute session.persisting?
         set_params_for(ben)
-      
-        assert !session.persisting?
-        assert !session.unauthorized_record
-        assert !session.record
+
+        refute session.persisting?
+        refute session.unauthorized_record
+        refute session.record
         assert_nil controller.session["user_credentials"]
-      
+
         set_request_content_type("text/plain")
-        assert !session.persisting?
-        assert !session.unauthorized_record
+        refute session.persisting?
+        refute 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
-      
+
+        # should not persist since this is single access
+        assert_nil controller.session["user_credentials"]
+
         set_request_content_type("application/rss+xml")
         assert session.persisting?
         assert_equal ben, session.unauthorized_record
@@ -50,4 +56,4 @@ module SessionTest
       end
     end
   end
-end
+end

data/test/session_test/password_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   module PasswordTest
@@ -21,26 +21,25 @@ module SessionTest
 
       def test_generalize_credentials_error_mesages_set_to_false
         UserSession.generalize_credentials_error_messages false
-        assert !UserSession.generalize_credentials_error_messages
-        session = UserSession.create(:login => users(:ben).login, :password => "invalud-password")
+        refute UserSession.generalize_credentials_error_messages
+        session = UserSession.create(login: users(:ben).login, password: "invalud-password")
         assert_equal ["Password is not valid"], session.errors.full_messages
       end
 
       def test_generalize_credentials_error_messages_set_to_true
         UserSession.generalize_credentials_error_messages true
         assert UserSession.generalize_credentials_error_messages
-        session = UserSession.create(:login => users(:ben).login, :password => "invalud-password")
+        session = UserSession.create(login: users(:ben).login, password: "invalud-password")
         assert_equal ["Login/Password combination is not valid"], session.errors.full_messages
       end
 
       def test_generalize_credentials_error_messages_set_to_string
-        UserSession.generalize_credentials_error_messages= "Custom Error Message"
+        UserSession.generalize_credentials_error_messages = "Custom Error Message"
         assert UserSession.generalize_credentials_error_messages
-        session = UserSession.create(:login => users(:ben).login, :password => "invalud-password")
+        session = UserSession.create(login: users(:ben).login, password: "invalud-password")
         assert_equal ["Custom Error Message"], session.errors.full_messages
       end
 
-
       def test_login_field
         UserSession.configured_password_methods = false
         UserSession.login_field = :saweet
@@ -80,23 +79,23 @@ module SessionTest
 
       def test_credentials
         session = UserSession.new
-        session.credentials = {:login => "login", :password => "pass"}
+        session.credentials = { login: "login", password: "pass" }
         assert_equal "login", session.login
         assert_nil session.password
         assert_equal "pass", session.send(:protected_password)
-        assert_equal({:password => "<protected>", :login => "login"}, session.credentials)
+        assert_equal({ password: "<protected>", login: "login" }, session.credentials)
       end
 
       def test_credentials_are_params_safe
         session = UserSession.new
-        assert_nothing_raised { session.credentials = {:hacker_method => "error!"} }
+        assert_nothing_raised { session.credentials = { hacker_method: "error!" } }
       end
 
       def test_save_with_credentials
         aaron = users(:aaron)
-        session = UserSession.new(:login => aaron.login, :password => "aaronrocks")
+        session = UserSession.new(login: aaron.login, password: "aaronrocks")
         assert session.save
-        assert !session.new_session?
+        refute session.new_session?
         assert_equal 1, session.record.login_count
         assert Time.now >= session.record.current_login_at
         assert_equal "1.1.1.1", session.record.current_login_ip

data/test/session_test/perishability_test.rb

@@ -1,15 +1,15 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   class PerishabilityTest < ActiveSupport::TestCase
     def test_after_save
       ben = users(:ben)
       old_perishable_token = ben.perishable_token
-      session = UserSession.create(ben)
+      UserSession.create(ben)
       assert_not_equal old_perishable_token, ben.perishable_token
-      
+
       drew = employees(:drew)
-      assert UserSession.create(drew)
+      refute UserSession.create(drew).new_session?
     end
   end
-end
+end

data/test/session_test/persistence_test.rb

@@ -1,10 +1,11 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   class PersistenceTest < ActiveSupport::TestCase
     def test_find
       aaron = users(:aaron)
-      assert !UserSession.find
+      refute UserSession.find
+      UserSession.allow_http_basic_auth = true
       http_basic_auth_for(aaron) { assert UserSession.find }
       set_cookie_for(aaron)
       assert UserSession.find
@@ -22,7 +23,7 @@ module SessionTest
       aaron = users(:aaron)
       session = UserSession.new(aaron)
       session.remember_me = true
-      assert !UserSession.remember_me
+      refute UserSession.remember_me
       assert session.save
       assert session.remember_me?
       session = UserSession.find(aaron)

data/test/session_test/scopes_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 module SessionTest
   class ScopesTest < ActiveSupport::TestCase
@@ -6,7 +6,7 @@ module SessionTest
       assert_nil Authlogic::Session::Base.scope
 
       thread1 = Thread.new do
-        scope = {:id => :scope1}
+        scope = { id: :scope1 }
         Authlogic::Session::Base.send(:scope=, scope)
         assert_equal scope, Authlogic::Session::Base.scope
       end
@@ -15,7 +15,7 @@ module SessionTest
       assert_nil Authlogic::Session::Base.scope
 
       thread2 = Thread.new do
-        scope = {:id => :scope2}
+        scope = { id: :scope2 }
         Authlogic::Session::Base.send(:scope=, scope)
         assert_equal scope, Authlogic::Session::Base.scope
       end
@@ -27,17 +27,23 @@ module SessionTest
     def test_with_scope_method
       assert_raise(ArgumentError) { UserSession.with_scope }
 
-      UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
-        assert_equal({:find_options => {:conditions => "awesome = 1"}, :id => "some_id"}, UserSession.scope)
+      UserSession.with_scope(find_options: { conditions: "awesome = 1" }, id: "some_id") do
+        assert_equal(
+          { find_options: { conditions: "awesome = 1" }, id: "some_id" },
+          UserSession.scope
+        )
       end
 
       assert_nil UserSession.scope
     end
 
     def test_initialize
-      UserSession.with_scope(:find_options => {:conditions => "awesome = 1"}, :id => "some_id") do
+      UserSession.with_scope(find_options: { conditions: "awesome = 1" }, id: "some_id") do
         session = UserSession.new
-        assert_equal({:find_options => {:conditions => "awesome = 1"}, :id => "some_id"}, session.scope)
+        assert_equal(
+          { find_options: { conditions: "awesome = 1" }, id: "some_id" },
+          session.scope
+        )
         session.id = :another_id
         assert_equal "another_id_some_id_test", session.send(:build_key, "test")
       end
@@ -51,10 +57,10 @@ module SessionTest
       session = UserSession.new
       assert_equal zack, session.send(:search_for_record, "find_by_login", zack.login)
 
-      session.scope = {:find_options => {:conditions => ["company_id = ?", binary_logic.id]}}
+      session.scope = { find_options: { conditions: ["company_id = ?", binary_logic.id] } }
       assert_nil session.send(:search_for_record, "find_by_login", zack.login)
 
       assert_equal ben, session.send(:search_for_record, "find_by_login", ben.login)
     end
   end
-end
+end