Remove more warnings: no need to define attr_accessor if already exis…

…ts. Initialize ivar.
rails · Sep 28, 2010 · 3f94b45 · 3f94b45
1 parent 19d9fff
commit 3f94b45
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb
@@ -462,9 +462,11 @@ def build_request_uri(action, parameters)
     # The exception is stored in the exception accessor for further inspection.
     module RaiseActionExceptions
       def self.included(base)
-        base.class_eval do
+        unless base.method_defined?(:exception) && base.method_defined?(:exception=)
-          attr_accessor :exception
+          base.class_eval do
-          protected :exception, :exception=
+            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
@@ -327,6 +327,7 @@ def render_to_string_test
   end
 
   def default_render
+    @alternate_default_render ||= nil
     if @alternate_default_render
       @alternate_default_render.call
     else