1 files changed, 12 insertions, 0 deletions
diff --git a/actionpack/test/new_base/test_helper.rb b/actionpack/test/new_base/test_helper.rb
index 5edd7b4f63..d29449ddc1 100644
--- a/actionpack/test/new_base/test_helper.rb
+++ b/actionpack/test/new_base/test_helper.rb
@@ -69,6 +69,15 @@ class Rack::TestCase < ActiveSupport::TestCase
     end
     
     ActionController::Routing.use_controllers!(controllers)
+    
+    # Move into a bootloader
+    AbstractController::Base.subclasses.each do |klass|
+      klass = klass.constantize
+      next unless klass < AbstractController::Layouts
+      klass.class_eval do
+        _write_layout_method
+      end
+    end    
   end
     
   def app
@@ -123,6 +132,9 @@ class Rack::TestCase < ActiveSupport::TestCase
   
 end
 
+class ::ApplicationController < ActionController::Base2
+end
+
 class SimpleRouteCase < Rack::TestCase
   setup do
     ActionController::Routing::Routes.draw do |map|