diff options
author | José Valim <jose.valim@gmail.com> | 2010-10-03 21:48:32 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-10-03 21:48:32 +0200 |
commit | 5f292c944155851df7e493f153cfb9d64c964388 (patch) | |
tree | 6adf5e0ff2c9fd6a198cd7faf30d294700a57096 /actionpack/lib/action_controller/test_case.rb | |
parent | 5836af8f8b0eb3c569c66792abf50a0485bb6f22 (diff) | |
parent | 653acac069e66f53b791caa4838a1e25de905f31 (diff) | |
download | rails-5f292c944155851df7e493f153cfb9d64c964388.tar.gz rails-5f292c944155851df7e493f153cfb9d64c964388.tar.bz2 rails-5f292c944155851df7e493f153cfb9d64c964388.zip |
Merge branch 'racksession'
Diffstat (limited to 'actionpack/lib/action_controller/test_case.rb')
-rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 1af75fc2d7..6061945622 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -187,15 +187,18 @@ module ActionController end end - class TestSession < ActionDispatch::Session::AbstractStore::SessionHash #:nodoc: - DEFAULT_OPTIONS = ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS + class TestSession < Rack::Session::Abstract::SessionHash #:nodoc: + DEFAULT_OPTIONS = Rack::Session::Abstract::ID::DEFAULT_OPTIONS def initialize(session = {}) + @env, @by = nil, nil replace(session.stringify_keys) @loaded = true end - def exists?; true; end + def exists? + true + end end # Superclass for ActionController functional tests. Functional tests allow you to |