diff options
| author | Yves Senn <yves.senn@gmail.com> | 2012-12-15 20:21:40 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-02-04 14:46:50 +0100 |
| commit | cce94e7232fdd53d5212d85b6f6ecc411baa0b16 (patch) | |
| tree | 917af7c7434d28e0efa626648708b16a7e4fb71c /actionpack/lib/action_controller | |
| parent | c21ab338cb9e38a0bfa51ac8cf4d70285f03c7b2 (diff) | |
| download | rails-cce94e7232fdd53d5212d85b6f6ecc411baa0b16.tar.gz rails-cce94e7232fdd53d5212d85b6f6ecc411baa0b16.tar.bz2 rails-cce94e7232fdd53d5212d85b6f6ecc411baa0b16.zip | |
partials inside directory work with `assert_template`
previously when a partial was placed inside a directory
(eg. '/dir/_partial'), `assert_template` did not replace
the '_' prefix when looking through rendered tempaltes,
which resulted in an error.
I modified it to replace both, the leading '_' and the last '_'
after a '/'.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index 9a7f1b5c3a..bba1f1e201 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -126,7 +126,8 @@ module ActionController if expected_partial = options[:partial] if expected_locals = options[:locals] if defined?(@_rendered_views) - view = expected_partial.to_s.sub(/^_/,'') + view = expected_partial.to_s.sub(/^_/, '').sub(/\/_(?=[^\/]+\z)/, '/') + partial_was_not_rendered_msg = "expected %s to be rendered but it was not." % view assert_includes @_rendered_views.rendered_views, view, partial_was_not_rendered_msg |