Remove unneeded AV::Base and AV::Template monkey-patches

3 files changed, 3 insertions, 24 deletions

diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 16664098e5..94c9ec7478 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -1,4 +1,5 @@
 require "abstract_controller/base"
+require "action_view/base"
 
 module AbstractController
   class DoubleRenderError < Error
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 8750a501b7..1c69c23bfc 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -2,27 +2,6 @@ require 'action_controller/test_case'
 require 'action_view'
 
 module ActionView
-  class Base
-    alias_method :initialize_without_template_tracking, :initialize
-    def initialize(*args)
-      @_rendered = { :template => nil, :partials => Hash.new(0) }
-      initialize_without_template_tracking(*args)
-    end
-
-    attr_internal :rendered
-  end
-
-  class Template
-    alias_method :render_without_tracking, :render
-    def render(view, locals, &blk)
-      rendered = view.rendered
-      rendered[:partials][self] += 1 if partial?
-      rendered[:template] ||= []
-      rendered[:template] << self
-      render_without_tracking(view, locals, &blk)
-    end
-  end
-
   class TestCase < ActiveSupport::TestCase
     class TestController < ActionController::Base
       attr_accessor :request, :response, :params
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index 26e0d6d844..b6810b0c27 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -365,11 +365,10 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   # check if we were rendered by a file-based template?
   def test_rendered_action
     process :nothing
-    assert_nil @controller.template.rendered[:template]
+    assert_template nil
 
     process :hello_world
-    assert @controller.template.rendered[:template]
-    assert 'hello_world', @controller.template.rendered[:template].to_s
+    assert_template 'hello_world'
   end
 
   # check the redirection location