diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-01-06 17:43:53 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-01-06 17:43:58 -0800 |
| commit | dabf20d54b42a2bbe004ceba29c26da147314a46 (patch) | |
| tree | dfcdd64813a311c672306e0c6f1e0de2912fa597 /railties | |
| parent | 3027f9f918a1fda5c66aa3e7bb4af1f8064b10ba (diff) | |
| parent | 8736dd324117af90e0bf120cfd2074b06ccb45eb (diff) | |
| download | rails-dabf20d54b42a2bbe004ceba29c26da147314a46.tar.gz rails-dabf20d54b42a2bbe004ceba29c26da147314a46.tar.bz2 rails-dabf20d54b42a2bbe004ceba29c26da147314a46.zip | |
Sync 'rails/rails/master'
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/test_help.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/railties/lib/test_help.rb b/railties/lib/test_help.rb index b5c92c1790..93ba1bc216 100644 --- a/railties/lib/test_help.rb +++ b/railties/lib/test_help.rb @@ -3,8 +3,7 @@ silence_warnings { RAILS_ENV = "test" } require 'test/unit' -require 'active_support/test_case' -require 'action_controller/test_case' +require 'action_controller/test_process' require 'action_view/test_case' require 'action_controller/integration' require 'action_mailer/test_case' if defined?(ActionMailer) |