Speed up template inheritance and remove template inheritance option

1 files changed, 0 insertions, 12 deletions

diff --git a/actionpack/test/controller/new_base/render_test.rb b/actionpack/test/controller/new_base/render_test.rb
index f5baa829b6..d6062bfa8c 100644
--- a/actionpack/test/controller/new_base/render_test.rb
+++ b/actionpack/test/controller/new_base/render_test.rb
@@ -53,10 +53,6 @@ module Render
     prepend_view_path ActionView::FixtureResolver.new("render/child_render/overriden_with_own_view_paths_prepended.html.erb" => "child content")
   end
 
-  class ChildRenderWithoutInheritanceController < BlankRenderController
-    config.template_inheritance = false
-  end
-
   class RenderTest < Rack::TestCase
     test "render with blank" do
       with_routing do |set|
@@ -138,12 +134,4 @@ module Render
       assert_body "Hello world!"
     end
   end
-
-  class TestNoViewInheritance < Rack::TestCase
-    test "Template from parent controller does not get picked if config.action_controller.template_inheritance = false" do
-      assert_raises(ActionView::MissingTemplate) do
-        get "/render/child_render_without_inheritance/index", {}, "action_dispatch.show_exceptions" => false
-      end
-    end
-  end
 end