1 files changed, 3 insertions, 19 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb
index c3d7b0778d..feb2f81cc1 100644
--- a/actionpack/test/controller/layout_test.rb
+++ b/actionpack/test/controller/layout_test.rb
@@ -165,26 +165,10 @@ class LayoutSetInResponseTest < ActionController::TestCase
     assert_nil @controller.template.layout
   end
 
-  for_tag(:old_base) do
-    # exempt_from_layout is deprecated
-    def test_exempt_from_layout_honored_by_render_template
-      ActionController::Base.exempt_from_layout :erb
-      @controller = RenderWithTemplateOptionController.new
-
-      get :hello
-      assert_equal "alt/hello.rhtml", @response.body.strip
-
-    ensure
-      ActionController::Base.exempt_from_layout.delete(ERB)
-    end
-  end
-
   def test_layout_is_picked_from_the_controller_instances_view_path
-    pending do
-      @controller = PrependsViewPathController.new
-      get :hello
-      assert_equal 'layouts/alt', @controller.template.layout
-    end
+    @controller = PrependsViewPathController.new
+    get :hello
+    assert @controller.template.layout =~ /layouts\/alt\.\w+/
   end
 
   def test_absolute_pathed_layout