aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2012-12-15 20:21:40 +0100
committerYves Senn <yves.senn@gmail.com>2013-02-04 14:46:50 +0100
commitcce94e7232fdd53d5212d85b6f6ecc411baa0b16 (patch)
tree917af7c7434d28e0efa626648708b16a7e4fb71c /actionpack/test/fixtures
parentc21ab338cb9e38a0bfa51ac8cf4d70285f03c7b2 (diff)
downloadrails-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/test/fixtures')
-rw-r--r--actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb1
-rw-r--r--actionpack/test/fixtures/test/render_partial_inside_directory.html.erb1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb b/actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb
new file mode 100644
index 0000000000..1cc8d41475
--- /dev/null
+++ b/actionpack/test/fixtures/test/_directory/_partial_with_locales.html.erb
@@ -0,0 +1 @@
+Hello <%= name %>
diff --git a/actionpack/test/fixtures/test/render_partial_inside_directory.html.erb b/actionpack/test/fixtures/test/render_partial_inside_directory.html.erb
new file mode 100644
index 0000000000..1461b95186
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_partial_inside_directory.html.erb
@@ -0,0 +1 @@
+<%= render partial: 'test/_directory/partial_with_locales', locals: {'name' => 'Jane'} %>