Remove more warnings: no need to define attr_accessor if already exists. Initialize ivar.

2 files changed, 6 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
index f1ff57f0cb..70a5de7f30 100644
--- a/actionpack/lib/action_controller/test_case.rb
+++ b/actionpack/lib/action_controller/test_case.rb
@@ -462,9 +462,11 @@ module ActionController
     # The exception is stored in the exception accessor for further inspection.
     module RaiseActionExceptions
       def self.included(base)
-        base.class_eval do
-          attr_accessor :exception
-          protected :exception, :exception=
+        unless base.method_defined?(:exception) && base.method_defined?(:exception=)
+          base.class_eval do
+            attr_accessor :exception
+            protected :exception, :exception=
+          end
         end
       end
 
diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb
index 42723c834e..5d1341af1b 100644
--- a/actionpack/test/controller/render_test.rb
+++ b/actionpack/test/controller/render_test.rb
@@ -327,6 +327,7 @@ class TestController < ActionController::Base
   end
 
   def default_render
+    @alternate_default_render ||= nil
     if @alternate_default_render
       @alternate_default_render.call
     else