diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
| commit | 2ebe8d275efa53af967b09ad66dab68acc1aed98 (patch) | |
| tree | b0b3e42c277b213788b55558aef3579f4e242300 /actionpack/lib/action_controller/assertions | |
| parent | 73ef94e9675ef6db85f18f1e3c70bf6ddfc1260a (diff) | |
| parent | 8cb14ee1203c9ed380c4b192e8730757a52d43cb (diff) | |
| download | rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.gz rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.bz2 rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/request.rb
actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'actionpack/lib/action_controller/assertions')
| -rw-r--r-- | actionpack/lib/action_controller/assertions/response_assertions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/assertions/response_assertions.rb b/actionpack/lib/action_controller/assertions/response_assertions.rb index 765225ae24..e2e8bbdc71 100644 --- a/actionpack/lib/action_controller/assertions/response_assertions.rb +++ b/actionpack/lib/action_controller/assertions/response_assertions.rb @@ -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, "expecting <?> but rendering with <?>", expected, rendered) assert_block(msg) do if expected.nil? - @response.rendered_template.nil? + @response.rendered_template.blank? else rendered.to_s.match(expected) end |