diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-12 16:13:00 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-12 16:13:00 -0300 |
| commit | 0048897a417774f7e5a0c8c9e82fc8684f94ebc1 (patch) | |
| tree | 8df248dab434bdaac61ea60249d4630958260eed /actionpack/lib/action_controller/testing/process.rb | |
| parent | 6c7d8cb8ac9e6b6775e9a54ef0be62dbaab592f5 (diff) | |
| parent | 22c5667c2ef46d6723c1805d3adc52dc8e92429b (diff) | |
| download | rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.tar.gz rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.tar.bz2 rails-0048897a417774f7e5a0c8c9e82fc8684f94ebc1.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/testing/process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/testing/process.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/process.rb b/actionpack/lib/action_controller/testing/process.rb index 49e8322491..21023ac101 100644 --- a/actionpack/lib/action_controller/testing/process.rb +++ b/actionpack/lib/action_controller/testing/process.rb @@ -131,6 +131,9 @@ module ActionController #:nodoc: @request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash build_request_uri(action, parameters) + @request.env["action_controller.rescue.request"] = @request + @request.env["action_controller.rescue.response"] = @response + Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest env = @request.env @@ -139,7 +142,7 @@ module ActionController #:nodoc: # TODO: Enable Lint # app = Rack::Lint.new(app) - status, headers, body = app.call(env) + status, headers, body = app.action(action, env) response = Rack::MockResponse.new(status, headers, body) @response.request, @response.template = @request, @controller.template |