2 files changed, 13 insertions, 8 deletions
diff --git a/actionpack/test/lib/controller/fake_controllers.rb b/actionpack/test/lib/controller/fake_controllers.rb
index 75c114c103..6e02e2d21b 100644
--- a/actionpack/test/lib/controller/fake_controllers.rb
+++ b/actionpack/test/lib/controller/fake_controllers.rb
@@ -1,15 +1,16 @@
 class << Object; alias_method :const_available?, :const_defined?; end
-  
-class ContentController < Class.new(ActionController::Base)
+
+class ContentController < ActionController::Base
 end
 class NotAController
 end
 module Admin
   class << self; alias_method :const_available?, :const_defined?; end
-  class UserController < Class.new(ActionController::Base); end
-  class NewsFeedController < Class.new(ActionController::Base); end
+  class UserController < ActionController::Base; end
+  class NewsFeedController < ActionController::Base; end
 end
 
+
 # For speed test
 class SpeedController < ActionController::Base;  end
 class SearchController        < SpeedController; end
diff --git a/actionpack/test/lib/controller/fake_models.rb b/actionpack/test/lib/controller/fake_models.rb
index 0faf8f3f9a..18eff7516b 100644
--- a/actionpack/test/lib/controller/fake_models.rb
+++ b/actionpack/test/lib/controller/fake_models.rb
@@ -10,12 +10,16 @@ class Customer < Struct.new(:name, :id)
     id.to_s
   end
 
-  def to_xml
-    "XML"
+  def to_xml(options={})
+    if options[:builder]
+      options[:builder].name name
+    else
+      "<name>#{name}</name>"
+    end
   end
 
-  def to_js
-    "JS"
+  def to_js(options={})
+    "name: #{name.inspect}"
   end
 
   def errors