aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-05-25 16:52:44 +0200
committerPratik Naik <pratiknaik@gmail.com>2009-05-25 16:52:44 +0200
commit9cda410d818353a5c27cbd5df754f1d1e290927d (patch)
tree4c5cd8f04c10e9efc9c5e54e127a72f488c3ee76 /actionpack
parent8097da93ccbfaec82e7785ded7b3e68c8248b32f (diff)
downloadrails-9cda410d818353a5c27cbd5df754f1d1e290927d.tar.gz
rails-9cda410d818353a5c27cbd5df754f1d1e290927d.tar.bz2
rails-9cda410d818353a5c27cbd5df754f1d1e290927d.zip
Make cookie store tests pass with the new base
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/dispatch/session/cookie_store_test.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index 3090a70244..2db76818ac 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -5,6 +5,9 @@ class CookieStoreTest < ActionController::IntegrationTest
SessionKey = '_myapp_session'
SessionSecret = 'b3c631c314c0bbca50c1b2843150fe33'
+ # Make sure Session middleware doesnt get included in the middleware stack
+ ActionController::Base.session_store = nil
+
DispatcherApp = ActionController::Dispatcher.new
CookieStoreApp = ActionDispatch::Session::CookieStore.new(DispatcherApp,
:key => SessionKey, :secret => SessionSecret)