2 files changed, 16 insertions, 9 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 9471f36de3..4c2136de8a 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -91,6 +91,9 @@ module ActionController
     deprecated_config_writer :session_store
     deprecated_config_writer :session_options
     deprecated_config_accessor :relative_url_root, "relative_url_root is ineffective. Please stop using it"
+    deprecated_config_accessor :assets_dir
+    deprecated_config_accessor :javascripts_dir
+    deprecated_config_accessor :stylesheets_dir
 
     # For old tests
     def initialize_template_class(*) end
diff --git a/actionpack/lib/action_controller/metal/session_management.rb b/actionpack/lib/action_controller/metal/session_management.rb
index 09ef9261a4..ce8b20964b 100644
--- a/actionpack/lib/action_controller/metal/session_management.rb
+++ b/actionpack/lib/action_controller/metal/session_management.rb
@@ -3,24 +3,28 @@ module ActionController #:nodoc:
     extend ActiveSupport::Concern
 
     included do
-      self.config.session_store   ||= :cookie_store
+      # This is still needed for the session secret for some reason.
       self.config.session_options ||= {}
     end
 
+    def self.session_store_for(store)
+      case store
+      when :active_record_store
+        ActiveRecord::SessionStore
+      when Symbol
+        ActionDispatch::Session.const_get(store.to_s.camelize)
+      else
+        store
+      end
+    end
+
     module ClassMethods
       def session_options
         config.session_options
       end
 
       def session_store
-        case store = config.session_store
-        when :active_record_store
-          ActiveRecord::SessionStore
-        when Symbol
-          ActionDispatch::Session.const_get(store.to_s.camelize)
-        else
-          store
-        end
+        SessionManagement.session_store_for(config.session_store)
       end
 
       def session=(options = {})