diff options
| author | Joshua Peek <josh@joshpeek.com> | 2009-05-02 14:57:40 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2009-05-02 14:57:40 -0500 |
| commit | a8b75c480fc9774252f5976dcf1a614079822e56 (patch) | |
| tree | b2567b106a5a87472340bdeab54f4b1880fe06df /actionpack/lib/action_controller/testing | |
| parent | 3900f4007ee6463b8936af23c04017a900673866 (diff) | |
| download | rails-a8b75c480fc9774252f5976dcf1a614079822e56.tar.gz rails-a8b75c480fc9774252f5976dcf1a614079822e56.tar.bz2 rails-a8b75c480fc9774252f5976dcf1a614079822e56.zip | |
Functional test runner finalizes response just like the integration test runner. In both runners, the @response object will now behave the same.
Some functional tests will need to be updated if they are relying on preprocessed data on the response.
Diffstat (limited to 'actionpack/lib/action_controller/testing')
| -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 f62d18a1f9..b44ec2f94b 100644 --- a/actionpack/lib/action_controller/testing/process.rb +++ b/actionpack/lib/action_controller/testing/process.rb @@ -132,7 +132,10 @@ module ActionController #:nodoc: Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest - @controller.process(@request, @response) + response = Rack::MockResponse.new(*@controller.process(@request, ActionDispatch::Response.new).to_a) + @response.request, @response.template = @request, @controller.template + @response.status, @response.headers, @response.body = response.status, response.headers, response.body + @response end def xml_http_request(request_method, action, parameters = nil, session = nil, flash = nil) |