2 files changed, 17 insertions, 9 deletions
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 560c09509b..c286976315 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -48,6 +48,8 @@ class PageCachingTest < ActionController::TestCase
     super
     ActionController::Base.perform_caching = true
 
+    ActionController::Routing::Routes.clear!
+
     ActionController::Routing::Routes.draw do |map|
       map.main '', :controller => 'posts'
       map.formatted_posts 'posts.:format', :controller => 'posts'
diff --git a/actionpack/test/controller/mime_responds_test.rb b/actionpack/test/controller/mime_responds_test.rb
index 7cd5145a2f..3b8babb84c 100644
--- a/actionpack/test/controller/mime_responds_test.rb
+++ b/actionpack/test/controller/mime_responds_test.rb
@@ -437,7 +437,7 @@ class MimeControllerTest < ActionController::TestCase
     @controller.instance_eval do
       def render(*args)
         unless args.empty?
-          @action = args.first[:action]
+          @action = args.first[:action] || action_name
         end
         response.body = "#{@action} - #{@template.formats}"
       end
@@ -490,14 +490,15 @@ class PostController < AbstractPostController
     end
   end
 
-  protected
-    def with_iphone
-      Mime::Type.register_alias("text/html", :iphone)
-      request.format = "iphone" if request.env["HTTP_ACCEPT"] == "text/iphone"
-      yield
-    ensure
-      Mime.module_eval { remove_const :IPHONE if const_defined?(:IPHONE) }
-    end
+protected
+
+  def with_iphone
+    Mime::Type.register_alias("text/html", :iphone)
+    request.format = "iphone" if request.env["HTTP_ACCEPT"] == "text/iphone"
+    yield
+  ensure
+    Mime.module_eval { remove_const :IPHONE if const_defined?(:IPHONE) }
+  end
 end
 
 class SuperPostController < PostController
@@ -509,6 +510,11 @@ class SuperPostController < PostController
   end
 end
 
+if ENV["new_base"]
+  PostController._write_layout_method
+  SuperPostController._write_layout_method
+end
+
 class MimeControllerLayoutsTest < ActionController::TestCase
   tests PostController