1 files changed, 5 insertions, 11 deletions
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index f5ac886c20..40f6dc6f0f 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -3,7 +3,6 @@ require 'abstract_unit'
 class ViewLoadPathsTest < ActionController::TestCase
   class TestController < ActionController::Base
     def self.controller_path() "test" end
-    def rescue_action(e) raise end
 
     before_filter :add_view_path, :only => :hello_world_at_request_time
 
@@ -16,22 +15,17 @@ class ViewLoadPathsTest < ActionController::TestCase
       end
   end
 
-  class Test::SubController < ActionController::Base
-    layout 'test/sub'
-    def hello_world; render(:template => 'test/hello_world'); end
+  module Test
+    class SubController < ActionController::Base
+      layout 'test/sub'
+      def hello_world; render(:template => 'test/hello_world'); end
+    end
   end
 
   def setup
-    # TestController.view_paths = nil
-
     @request  = ActionController::TestRequest.new
     @response = ActionController::TestResponse.new
-
     @controller = TestController.new
-    # Following is needed in order to setup @controller.template object properly
-    @controller.send :assign_shortcuts, @request, @response
-    @controller.send :initialize_template_class, @response
-
     @paths = TestController.view_paths
   end