aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/initializers
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-04 15:06:25 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-04 16:05:52 -0800
commite311622e7b20b3fdeab6a93418c8a45c6e7137b6 (patch)
treea0b7ce433c1ce65da2bc5e9fdb9e8d70753537da /railties/test/application/initializers
parent48bb3b3904806abaea7c62961559c03e689dd12f (diff)
downloadrails-e311622e7b20b3fdeab6a93418c8a45c6e7137b6.tar.gz
rails-e311622e7b20b3fdeab6a93418c8a45c6e7137b6.tar.bz2
rails-e311622e7b20b3fdeab6a93418c8a45c6e7137b6.zip
Deprecated ActionController::Base.session_options= and ActionController::Base.session_store= in favor of a config.session_store method (which takes params) and a config.cookie_secret variable, which is used in various secret scenarios. The old AC::Base options will continue to work with deprecation warnings.
Diffstat (limited to 'railties/test/application/initializers')
-rw-r--r--railties/test/application/initializers/frameworks_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index d74de3d666..8e57022e5b 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -65,7 +65,7 @@ module ApplicationTests
test "database middleware doesn't initialize when session store is not active_record" do
add_to_config <<-RUBY
config.root = "#{app_path}"
- config.action_dispatch.session_store = :cookie_store
+ config.session_store :cookie_store, { :key => "blahblahblah" }
RUBY
require "#{app_path}/config/environment"
@@ -73,7 +73,7 @@ module ApplicationTests
end
test "database middleware initializes when session store is active record" do
- add_to_config "config.action_dispatch.session_store = :active_record_store"
+ add_to_config "config.session_store :active_record_store"
require "#{app_path}/config/environment"