1 files changed, 6 insertions, 12 deletions
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 981c023d38..bf068aedcd 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -50,7 +50,7 @@ module AbstractController
       end
 
       def index_to_string
-        self.response_body = render_to_string "index.erb"
+        self.response_body = render_to_string "index"
       end
 
       def action_with_ivars
@@ -63,11 +63,11 @@ module AbstractController
       end
 
       def rendering_to_body
-        self.response_body = render_to_body :template => "naked_render.erb"
+        self.response_body = render_to_body :template => "naked_render"
       end
 
       def rendering_to_string
-        self.response_body = render_to_string :template => "naked_render.erb"
+        self.response_body = render_to_string :template => "naked_render"
       end
     end
 
@@ -178,16 +178,10 @@ module AbstractController
       end
     end
 
-    class Me5 < WithLayouts
-      def index
-        render
-      end
-    end
-
     class TestLayouts < ActiveSupport::TestCase
       test "layouts are included" do
         controller = Me4.new
-        result = controller.process(:index)
+        controller.process(:index)
         assert_equal "Me4 Enter : Hello from me4/index.erb : Exit", controller.response_body
       end
     end
@@ -241,11 +235,11 @@ module AbstractController
         assert_dispatch ActionMissingRespondToActionController, "success", :ohai
       end
 
-      test "a method is available as an action if respond_to_action? returns true" do
+      test "a method is available as an action if method_for_action returns true" do
         assert_dispatch RespondToActionController, "success", :index
       end
 
-      test "raises ActionNotFound if method is defined but respond_to_action? returns false" do
+      test "raises ActionNotFound if method is defined but method_for_action returns false" do
         assert_raise(ActionNotFound) { RespondToActionController.new.process(:fail) }
       end
     end