Ensure render :text => resource first tries to invoke :to_text on it

actionpack/lib/action_controller/metal/rendering.rb

@@ -36,6 +36,13 @@ def _render_partial(options)
         super
       end
 
+      def _determine_template(options)
+        if options.key?(:text) && options[:text].respond_to?(:to_text)
+          options[:text] = options[:text].to_text
+        end
+        super
+      end
+
       def format_for_text
         formats.first
       end

actionpack/test/controller/render_test.rb

@@ -214,6 +214,10 @@ def render_text_with_false
     render :text => false
   end
 
+  def render_text_with_resource
+    render :text => Customer.new("David")
+  end
+
   # :ported:
   def render_nothing_with_appendix
     render :text => "appended"
@@ -817,6 +821,11 @@ def test_render_nothing_with_appendix
     assert_equal 'appended', @response.body
   end
 
+  def test_render_text_with_resource
+    get :render_text_with_resource
+    assert_equal 'name: David', @response.body
+  end
+
   # :ported:
   def test_attempt_to_access_object_method
     assert_raise(ActionController::UnknownAction, "No action responded to [clone]") { get :clone }

actionpack/test/lib/controller/fake_models.rb

@@ -21,6 +21,7 @@ def to_xml(options={})
   def to_js(options={})
     "name: #{name.inspect}"
   end
+  alias :to_text :to_js
 
   def errors
     []