aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/application/initializers
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-04 12:12:04 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-04 12:12:04 -0800
commit9795bf0e74612aa542404460220720c14fac1038 (patch)
tree1453fe51b6003ed28e9d459609e4b94f54674992 /railties/test/application/initializers
parent17769696279810c6c24a10b0d47f9b712205f0ce (diff)
downloadrails-9795bf0e74612aa542404460220720c14fac1038.tar.gz
rails-9795bf0e74612aa542404460220720c14fac1038.tar.bz2
rails-9795bf0e74612aa542404460220720c14fac1038.zip
Fix Sam Ruby's tests and 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 91f31df2e7..d74de3d666 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_controller.session_store = :cookie_store
+ config.action_dispatch.session_store = :cookie_store
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_controller.session_store = :active_record_store"
+ add_to_config "config.action_dispatch.session_store = :active_record_store"
require "#{app_path}/config/environment"