diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-05 19:46:48 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-05 19:46:48 +0100 |
| commit | 6090513cfb8acb5554a6653a6f2cb87648585d41 (patch) | |
| tree | 99bfd589a48153e33f19ae72baa6e98f5708a9b8 /actionpack/lib/action_controller/integration.rb | |
| parent | 01159a6431bbc2dc7d7d95ce294c8567c954f39e (diff) | |
| parent | 4df45d86097efbeabceecfe53d8ea2da9ccbb107 (diff) | |
| download | rails-6090513cfb8acb5554a6653a6f2cb87648585d41.tar.gz rails-6090513cfb8acb5554a6653a6f2cb87648585d41.tar.bz2 rails-6090513cfb8acb5554a6653a6f2cb87648585d41.zip | |
Merge commit 'mainstream/master'
Conflicts:
activerecord/lib/active_record/association_preload.rb
Diffstat (limited to 'actionpack/lib/action_controller/integration.rb')
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index a98c1af7f9..fc473c269c 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -276,7 +276,7 @@ module ActionController ActionController::Base.clear_last_instantiation! env['rack.input'] = data.is_a?(IO) ? data : StringIO.new(data || '') - @status, @headers, result_body = ActionController::Dispatcher.new.call(env) + @status, @headers, result_body = ActionController::Dispatcher.new.mark_as_test_request!.call(env) @request_count += 1 @controller = ActionController::Base.last_instantiation |