diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-04-27 18:21:26 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-05-01 17:31:01 -0700 |
| commit | 8a4e77b4200946ba4ed42fe5927a7400a846063a (patch) | |
| tree | 4d61ebd026f32bd9af32c93f93b3071232b1d8ee /actionpack/lib/action_controller/dispatch | |
| parent | 34509777fd375e5bc529f21ca66cf63263c2cf64 (diff) | |
| download | rails-8a4e77b4200946ba4ed42fe5927a7400a846063a.tar.gz rails-8a4e77b4200946ba4ed42fe5927a7400a846063a.tar.bz2 rails-8a4e77b4200946ba4ed42fe5927a7400a846063a.zip | |
OMG, a lot of work
Diffstat (limited to 'actionpack/lib/action_controller/dispatch')
| -rw-r--r-- | actionpack/lib/action_controller/dispatch/dispatcher.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/dispatch/middlewares.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index bb9d8bd063..af2da8bfe5 100644 --- a/actionpack/lib/action_controller/dispatch/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb @@ -79,7 +79,7 @@ module ActionController run_callbacks :before_dispatch Routing::Routes.call(env) rescue Exception => exception - if controller ||= (::ApplicationController rescue Base) + if !env["rack.test"] && controller ||= (::ApplicationController rescue Base) controller.call_with_exception(env, exception).to_a else raise exception diff --git a/actionpack/lib/action_controller/dispatch/middlewares.rb b/actionpack/lib/action_controller/dispatch/middlewares.rb index b5adbae746..d87c0f9706 100644 --- a/actionpack/lib/action_controller/dispatch/middlewares.rb +++ b/actionpack/lib/action_controller/dispatch/middlewares.rb @@ -9,4 +9,4 @@ use lambda { ActionController::Base.session_store }, use "ActionDispatch::ParamsParser" use "Rack::MethodOverride" -use "Rack::Head" +use "Rack::Head"
\ No newline at end of file |