aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/activerecord
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-05-18 03:18:23 +0200
committerJosé Valim <jose.valim@gmail.com>2010-05-18 03:18:23 +0200
commitc53683595749dcfa223802669237480ac9ebc17f (patch)
tree345687d8dba7110323f47446231954b24fab73db /actionpack/test/activerecord
parent8e3c3b06dc8ff8842f6390efc58eaf4bb1a23060 (diff)
downloadrails-c53683595749dcfa223802669237480ac9ebc17f.tar.gz
rails-c53683595749dcfa223802669237480ac9ebc17f.tar.bz2
rails-c53683595749dcfa223802669237480ac9ebc17f.zip
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.
Diffstat (limited to 'actionpack/test/activerecord')
-rw-r--r--actionpack/test/activerecord/active_record_store_test.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index 61bee1b66c..6d4b8e1e40 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -152,12 +152,18 @@ class ActiveRecordStoreTest < ActionController::IntegrationTest
end
private
+
def with_test_route_set(options = {})
with_routing do |set|
set.draw do |map|
match ':action', :to => 'active_record_store_test/test'
end
- @app = ActiveRecord::SessionStore.new(set, options.reverse_merge(:key => '_session_id'))
+
+ @app = self.class.build_app(set) do |middleware|
+ middleware.use ActiveRecord::SessionStore, options.reverse_merge(:key => '_session_id')
+ middleware.delete "ActionDispatch::ShowExceptions"
+ end
+
yield
end
end