diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-16 16:59:12 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-16 16:59:12 -0300 |
| commit | 16ac353f4cb9510aad88240a1c566345da8ceeed (patch) | |
| tree | 1d3eb279cabea3d6b315ddc47d471f6fb08a029b /railties/test/rails_info_controller_test.rb | |
| parent | 34a068d053c7268caad78d4f1f90ab0e2a38682f (diff) | |
| parent | 01a4bc84b8787df74d54147a0cf564df75e87970 (diff) | |
| download | rails-16ac353f4cb9510aad88240a1c566345da8ceeed.tar.gz rails-16ac353f4cb9510aad88240a1c566345da8ceeed.tar.bz2 rails-16ac353f4cb9510aad88240a1c566345da8ceeed.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'railties/test/rails_info_controller_test.rb')
| -rw-r--r-- | railties/test/rails_info_controller_test.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index ab31f3a487..3deb81965c 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -1,6 +1,6 @@ require 'abstract_unit' require 'action_controller' -require 'action_controller/testing/process' +require 'action_controller/testing/process2' require 'rails/info' require 'rails/info_controller' @@ -9,6 +9,12 @@ ActionController::Routing::Routes.draw do |map| map.connect ':controller/:action/:id' end +module ActionController + class Base + include ActionController::Testing + end +end + class InfoControllerTest < ActionController::TestCase tests Rails::InfoController |