diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:16:35 -0800 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-03-03 21:24:27 -0800 |
| commit | 15b3b74624eb4c5ae383956950cab12ca9899131 (patch) | |
| tree | 7a8c5cf8044d79a7656abff25c080e06e7423d4c /railties | |
| parent | 1f0f05b10c924d2f0d0ff4c74cbd979e77deea1d (diff) | |
| download | rails-15b3b74624eb4c5ae383956950cab12ca9899131.tar.gz rails-15b3b74624eb4c5ae383956950cab12ca9899131.tar.bz2 rails-15b3b74624eb4c5ae383956950cab12ca9899131.zip | |
Fix all the broken tests due to the AC configuration refactor
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/configuration.rb | 2 | ||||
| -rw-r--r-- | railties/test/application/metal_test.rb | 4 | ||||
| -rw-r--r-- | railties/test/application/middleware_test.rb | 1 | ||||
| -rw-r--r-- | railties/test/railties/shared_tests.rb | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index a26978ef92..a78e115fe1 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -88,7 +88,7 @@ module Rails middleware.use('::Rack::Sendfile', lambda { action_dispatch.x_sendfile_header }) middleware.use('::ActionDispatch::Callbacks', lambda { !cache_classes }) middleware.use('::ActionDispatch::Cookies') - middleware.use(lambda { action_controller.session_store }, lambda { action_controller.session_options }) + middleware.use(lambda { ActionController::SessionManagement.session_store_for(action_controller.session_store) }, lambda { action_controller.session }) middleware.use('::ActionDispatch::Flash', :if => lambda { action_controller.session_store }) middleware.use(lambda { metal_loader.build_middleware(metals) }, :if => lambda { metal_loader.metals.any? }) middleware.use('ActionDispatch::ParamsParser') diff --git a/railties/test/application/metal_test.rb b/railties/test/application/metal_test.rb index 225bede117..1ec62282c8 100644 --- a/railties/test/application/metal_test.rb +++ b/railties/test/application/metal_test.rb @@ -28,7 +28,7 @@ module ApplicationTests end RUBY - get "/" + get "/not/slash" assert_equal 200, last_response.status assert_equal "FooMetal", last_response.body end @@ -50,7 +50,7 @@ module ApplicationTests end RUBY - get "/" + get "/not/slash" assert_equal 200, last_response.status assert_equal "Metal B", last_response.body end diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb index 5e869bff1e..9a359d20b1 100644 --- a/railties/test/application/middleware_test.rb +++ b/railties/test/application/middleware_test.rb @@ -19,6 +19,7 @@ module ApplicationTests "Rack::Runtime", "Rails::Rack::Logger", "ActionDispatch::ShowExceptions", + "ActionDispatch::RemoteIp", "Rack::Sendfile", "ActionDispatch::Callbacks", "ActionDispatch::Cookies", diff --git a/railties/test/railties/shared_tests.rb b/railties/test/railties/shared_tests.rb index 151abe21f8..0ebc8a2d3f 100644 --- a/railties/test/railties/shared_tests.rb +++ b/railties/test/railties/shared_tests.rb @@ -254,7 +254,7 @@ YAML require 'rack/test' extend Rack::Test::Methods - get "/" + get "/not/slash" assert_equal 200, last_response.status assert_equal "FooMetal", last_response.body end |