aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/session
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-09-26 20:51:05 -0500
committerJoshua Peek <josh@joshpeek.com>2009-09-26 20:51:05 -0500
commitacfeec515111d427b3a27aef3af034922e0d9248 (patch)
tree33e1ea90436ab5dc58fe8c2da4e3735696911e72 /actionpack/test/dispatch/session
parent02413baabbc2d7458377822974ee3405a91fe627 (diff)
downloadrails-acfeec515111d427b3a27aef3af034922e0d9248.tar.gz
rails-acfeec515111d427b3a27aef3af034922e0d9248.tar.bz2
rails-acfeec515111d427b3a27aef3af034922e0d9248.zip
Allow integration test rack app to be set with "@app" ivar instead of using open_session
Diffstat (limited to 'actionpack/test/dispatch/session')
-rw-r--r--actionpack/test/dispatch/session/cookie_store_test.rb4
-rw-r--r--actionpack/test/dispatch/session/mem_cache_store_test.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/actionpack/test/dispatch/session/cookie_store_test.rb b/actionpack/test/dispatch/session/cookie_store_test.rb
index bc0b4b22a5..6241c79829 100644
--- a/actionpack/test/dispatch/session/cookie_store_test.rb
+++ b/actionpack/test/dispatch/session/cookie_store_test.rb
@@ -222,8 +222,8 @@ class CookieStoreTest < ActionController::IntegrationTest
map.connect "/:action", :controller => "cookie_store_test/test"
end
options = {:key => SessionKey, :secret => SessionSecret}.merge(options)
- app = ActionDispatch::Session::CookieStore.new(set, options)
- @integration_session = open_session(app)
+ @app = ActionDispatch::Session::CookieStore.new(set, options)
+ reset!
yield
end
end
diff --git a/actionpack/test/dispatch/session/mem_cache_store_test.rb b/actionpack/test/dispatch/session/mem_cache_store_test.rb
index 4c6a80fdb8..c2d40ae24a 100644
--- a/actionpack/test/dispatch/session/mem_cache_store_test.rb
+++ b/actionpack/test/dispatch/session/mem_cache_store_test.rb
@@ -101,7 +101,7 @@ class MemCacheStoreTest < ActionController::IntegrationTest
get '/set_session_value', :_session_id => session_id
assert_response :success
- assert_equal nil, cookies['_session_id']
+ assert_not_equal session_id, cookies['_session_id']
end
end
rescue LoadError, RuntimeError
@@ -114,8 +114,8 @@ class MemCacheStoreTest < ActionController::IntegrationTest
set.draw do |map|
map.connect "/:action", :controller => "mem_cache_store_test/test"
end
- app = ActionDispatch::Session::MemCacheStore.new(set, :key => '_session_id')
- @integration_session = open_session(app)
+ @app = ActionDispatch::Session::MemCacheStore.new(set, :key => '_session_id')
+ reset!
yield
end
end