public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Make assert_template failure message more friendly

Signed-off-by: Joshua Peek <josh@joshpeek.com>
Jeffrey Hardy (author)
Tue Aug 05 14:29:56 -0700 2008
josh (committer)
Tue Aug 05 14:29:56 -0700 2008
commit  8d72b82b8da99eda9ba654b3d3a4da847a212406
tree    0f4a49a58826a218bc92208aa8f48f8d7bc36f9d
parent  dc66469e6464bbb6d7bd6f242731395b6574aca2
...
87
88
89
90
 
91
92
93
94
 
95
96
97
...
87
88
89
 
90
91
92
93
 
94
95
96
97
0
@@ -87,11 +87,11 @@ module ActionController
0
       #
0
       def assert_template(expected = nil, message=nil)
0
         clean_backtrace do
0
-          rendered = @response.rendered_template
0
+          rendered = @response.rendered_template.to_s
0
           msg = build_message(message, "expecting <?> but rendering with <?>", expected, rendered)
0
           assert_block(msg) do
0
             if expected.nil?
0
-              @response.rendered_template.nil?
0
+              @response.rendered_template.blank?
0
             else
0
               rendered.to_s.match(expected)
0
             end

Comments