aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/abstract_controller/rendering.rb1
-rw-r--r--actionpack/lib/action_view/test_case.rb21
2 files changed, 1 insertions, 21 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