Merge pull request #1443 from padrino/dont_override_session_id_admin_…

…if_set

Don't step over :session_id setting on admin apps

padrino-admin/lib/padrino-admin/access_control.rb

@@ -13,7 +13,7 @@ class << self
         # Method used by Padrino::Application when we register the extension.
         #
         def registered(app)
-          app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym
+          app.set :session_id, "_padrino_#{File.basename(Padrino.root)}_#{app.app_name}".to_sym unless app.respond_to?(:session_id)
           app.set :admin_model, 'Account' unless app.respond_to?(:admin_model)
           app.helpers Padrino::Admin::Helpers::AuthenticationHelpers
           app.helpers Padrino::Admin::Helpers::ViewHelpers

padrino-admin/test/test_admin_application.rb

@@ -6,6 +6,26 @@ def setup
     load_fixture 'data_mapper'
   end
 
+  describe "session id setting" do
+    it "should provide it if it doesn't exist" do
+      mock_app do
+        register Padrino::Admin::AccessControl
+      end
+
+      assert_equal @app.session_id, "_padrino_#{File.basename(Padrino.root)}_#{@app.app_name}".to_sym
+    end
+
+    # it "should preserve it if it already existed" do
+    #   Padrino.configure_apps { enable :sessions; set :session_id, "foo" }
+
+    #   mock_app do
+    #     register Padrino::Admin::AccessControl
+    #   end
+
+    #   assert_equal @app.session_id, "foo"
+    # end
+  end
+
   it 'should require correctly login' do
     mock_app do
       register Padrino::Admin::AccessControl