Remove ::Controllers related cruft; fix AP tests

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 4 insertions, 6 deletions

diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb
index 1488387f3c..6e539f8051 100644
--- a/railties/test/rails_info_controller_test.rb
+++ b/railties/test/rails_info_controller_test.rb
@@ -8,8 +8,6 @@ require 'action_controller'
 require 'action_controller/test_process'
 require 'rails_info'
 
-module Controllers; def self.const_available?(constant); false end end
-
 class ApplicationController < ActionController::Base
   @local_request = false
   class << self
@@ -29,24 +27,24 @@ end
 require 'rails_info_controller'
 
 # Re-raise errors caught by the controller.
-class Controllers::RailsInfoController; def rescue_action(e) raise e end; end
+class RailsInfoController; def rescue_action(e) raise e end; end
 
 class RailsInfoControllerTest < Test::Unit::TestCase
   def setup
-    @controller = Controllers::RailsInfoController.new
+    @controller = RailsInfoController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
 
   def test_rails_info_properties_table_rendered_for_local_request
-    Controllers::RailsInfoController.local_request = true
+    RailsInfoController.local_request = true
     get :properties
     assert_tag :tag => 'table'
     assert_response :success
   end
   
   def test_rails_info_properties_error_rendered_for_non_local_request
-    Controllers::RailsInfoController.local_request = false
+    RailsInfoController.local_request = false
     get :properties
     assert_tag :tag => 'p'
     assert_response 500