Add in checks to make sure session_class is not nil

jhe · Mar 27, 2009 · 3188817 · 3188817
1 parent 9be1f26
commit 3188817
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,6 +1,7 @@
 == 2.0.4
 
 * Added validates_uniqueness_of_login_field_options and validates_uniqueness_of_email_field_options configuration options
+* Add in checks to make sure session_class is not nil.
 
 == 2.0.3 released 2009-3-26
 

diff --git a/lib/authlogic/acts_as_authentic/session_maintenance.rb b/lib/authlogic/acts_as_authentic/session_maintenance.rb
@@ -74,7 +74,7 @@ def skip_session_maintenance
           end
 
           def update_sessions?
-            !skip_session_maintenance && session_class.activated? && !session_ids.blank? && persistence_token_changed?
+            !skip_session_maintenance && session_class && session_class.activated? && !session_ids.blank? && persistence_token_changed?
           end
 
           def get_session_information

diff --git a/lib/authlogic/test_case.rb b/lib/authlogic/test_case.rb
@@ -51,7 +51,7 @@ module Authlogic
   module TestCase
     # Activates authlogic with an Authlogic::TestCase::MockController object.
     def activate_authlogic
-      Authlogic::Session::Base.controller = controller
+      Authlogic::Session::Base.controller = (@request && Authlogic::ControllerAdapters::AbstractAdapter.new(@request)) || controller
     end
 
     # The Authlogic::TestCase::MockController object passed to Authlogic to activate it. You can access this in your test.