3 files changed, 4 insertions, 22 deletions
diff --git a/actionpack/test/abstract/abstract_controller_test.rb b/actionpack/test/abstract/abstract_controller_test.rb
index 981c023d38..5823e64637 100644
--- a/actionpack/test/abstract/abstract_controller_test.rb
+++ b/actionpack/test/abstract/abstract_controller_test.rb
@@ -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
diff --git a/actionpack/test/abstract/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index 3bdde86291..5d1a703c55 100644
--- a/actionpack/test/abstract/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -131,7 +131,7 @@ module AbstractController
       end
 
       def authenticate
-        @list = []
+        @list ||= []
         @authenticated = "true"
       end
     end
diff --git a/actionpack/test/abstract/layouts_test.rb b/actionpack/test/abstract/layouts_test.rb
index 5ed6aa68b5..86208899f8 100644
--- a/actionpack/test/abstract/layouts_test.rb
+++ b/actionpack/test/abstract/layouts_test.rb
@@ -87,18 +87,6 @@ module AbstractControllerTests
       end
     end
 
-    class WithSymbolReturningString < Base
-      layout :no_hello
-
-      def index
-        render :template => ActionView::Template::Text.new("Hello missing symbol!")
-      end
-    private
-      def no_hello
-        nil
-      end
-    end
-
     class WithSymbolReturningNil < Base
       layout :nilz