<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -87,11 +87,11 @@ module ActionController
       #
       def assert_template(expected = nil, message=nil)
         clean_backtrace do
-          rendered = @response.rendered_template
+          rendered = @response.rendered_template.to_s
           msg = build_message(message, &quot;expecting &lt;?&gt; but rendering with &lt;?&gt;&quot;, expected, rendered)
           assert_block(msg) do
             if expected.nil?
-              @response.rendered_template.nil?
+              @response.rendered_template.blank?
             else
               rendered.to_s.match(expected)
             end</diff>
      <filename>actionpack/lib/action_controller/assertions/response_assertions.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>dc66469e6464bbb6d7bd6f242731395b6574aca2</id>
    </parent>
  </parents>
  <author>
    <name>Jeffrey Hardy</name>
    <email>packagethief@gmail.com</email>
  </author>
  <url>http://github.com/rails/rails/commit/8d72b82b8da99eda9ba654b3d3a4da847a212406</url>
  <id>8d72b82b8da99eda9ba654b3d3a4da847a212406</id>
  <committed-date>2008-08-05T14:29:56-07:00</committed-date>
  <authored-date>2008-08-05T14:29:56-07:00</authored-date>
  <message>Make assert_template failure message more friendly

Signed-off-by: Joshua Peek &lt;josh@joshpeek.com&gt;</message>
  <tree>0f4a49a58826a218bc92208aa8f48f8d7bc36f9d</tree>
  <committer>
    <name>Joshua Peek</name>
    <email>josh@joshpeek.com</email>
  </committer>
</commit>
