diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-07-13 13:26:48 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-07-13 13:26:48 -0500 |
| commit | e0fef66149092dd3d2988fff64f0ce8765735687 (patch) | |
| tree | 76b20ee8e265f74610eb2836be5bc27c300da2a4 /actionpack/lib/action_controller/assertions/response_assertions.rb | |
| parent | 99cc85bc099a757cdd44e4f5f1be4972ab124e0d (diff) | |
| download | rails-e0fef66149092dd3d2988fff64f0ce8765735687.tar.gz rails-e0fef66149092dd3d2988fff64f0ce8765735687.tar.bz2 rails-e0fef66149092dd3d2988fff64f0ce8765735687.zip | |
Made ActionView::Base#first_render a little more private. And added _last_render to track the most recent render. Will fix #609 as a side effect. [#609 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller/assertions/response_assertions.rb')
| -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 cb36405700..a98c70d66f 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 = expected ? @response.rendered_file(!expected.include?('/')) : @response.rendered_file + 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_with_file? + @response.rendered_template ? true : false else rendered.match(expected) end |