diff options
| author | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-16 10:46:03 -0700 |
|---|---|---|
| committer | Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com> | 2009-06-16 10:46:03 -0700 |
| commit | 18c3b77b2381e9f7072d595fa9f599b0994852a7 (patch) | |
| tree | 979511c97310b34fccea57554a4ac7a0d9f6e805 /actionpack/lib/action_controller/testing/integration.rb | |
| parent | 1fbfa3e705c37656c308436f21d42b09591ba60e (diff) | |
| download | rails-18c3b77b2381e9f7072d595fa9f599b0994852a7.tar.gz rails-18c3b77b2381e9f7072d595fa9f599b0994852a7.tar.bz2 rails-18c3b77b2381e9f7072d595fa9f599b0994852a7.zip | |
Merge process2 into process to people's regular tests run :P
Diffstat (limited to 'actionpack/lib/action_controller/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_controller/testing/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb index 37ca93f22c..5cb0f48f82 100644 --- a/actionpack/lib/action_controller/testing/integration.rb +++ b/actionpack/lib/action_controller/testing/integration.rb @@ -245,7 +245,7 @@ module ActionController path = location.query ? "#{location.path}?#{location.query}" : location.path end - [ControllerCapture, ActionController::ProcessWithTest].each do |mod| + [ControllerCapture, ActionController::Testing].each do |mod| unless ActionController::Base < mod ActionController::Base.class_eval { include mod } end |