diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-01-07 15:52:19 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-09 00:14:28 -0800 |
| commit | 72c983466651e9e4deaff15486de0da3918ff4be (patch) | |
| tree | 907b16a27489948a974d654991834b716572d5ca /actionpack/lib | |
| parent | d99b4ec57f07005211bad7c0b6605b03f811c865 (diff) | |
| download | rails-72c983466651e9e4deaff15486de0da3918ff4be.tar.gz rails-72c983466651e9e4deaff15486de0da3918ff4be.tar.bz2 rails-72c983466651e9e4deaff15486de0da3918ff4be.zip | |
Set assigns for integration tests also
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/integration.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb index d9899112c3..ded72a71fb 100644 --- a/actionpack/lib/action_controller/integration.rb +++ b/actionpack/lib/action_controller/integration.rb @@ -367,8 +367,10 @@ module ActionController env[key] = value end - unless ActionController::Base.respond_to?(:clear_last_instantiation!) - ActionController::Base.module_eval { include ControllerCapture } + [ControllerCapture, ActionController::ProcessWithTest].each do |mod| + unless ActionController::Base < mod + ActionController::Base.class_eval { include mod } + end end ActionController::Base.clear_last_instantiation! @@ -396,6 +398,7 @@ module ActionController if @controller = ActionController::Base.last_instantiation @request = @controller.request @response = @controller.response + @controller.send(:set_test_assigns) else # Decorate responses from Rack Middleware and Rails Metal # as an Response for the purposes of integration testing |