Cut the fat and make session stores rely on request.cookie_jar and change set_session semantics to return the cookie value instead of a boolean.

2 files changed, 7 insertions, 2 deletions

diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index a6cdbf8032..21d11ff31c 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -199,7 +199,7 @@ class CookieStoreTest < ActionController::IntegrationTest
           match ':action', :to => ::CookieStoreTest::TestController
         end
 
-        options = { :key => SessionKey, :secret => SessionSecret }.merge!(options)
+        options = { :key => SessionKey }.merge!(options)
 
         @app = self.class.build_app(set) do |middleware|
           middleware.use ActionDispatch::Session::CookieStore, options
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 5a1dcb4dab..8858a398e0 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -114,7 +114,12 @@ class MemCacheStoreTest < ActionController::IntegrationTest
         set.draw do |map|
           match ':action', :to => ::MemCacheStoreTest::TestController
         end
-        @app = ActionDispatch::Session::MemCacheStore.new(set, :key => '_session_id')
+
+        @app = self.class.build_app(set) do |middleware|
+          middleware.use ActionDispatch::Session::MemCacheStore, :key => '_session_id'
+          middleware.delete "ActionDispatch::ShowExceptions"
+        end
+
         yield
       end
     end