Merge commit 'rails/master'

1 files changed, 8 insertions, 4 deletions

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