aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures/test
diff options
context:
space:
mode:
authorSam Stephenson <sam@37signals.com>2005-11-22 08:37:04 +0000
committerSam Stephenson <sam@37signals.com>2005-11-22 08:37:04 +0000
commitbea737eb5a5f51ee7fbc2e60d870cee5936bdfb0 (patch)
tree4c7f1d9df0b5db914648cf5742a7f953c60433e5 /actionpack/test/fixtures/test
parent130c493a4ff295723fa08935c71b89badef06cdc (diff)
downloadrails-bea737eb5a5f51ee7fbc2e60d870cee5936bdfb0.tar.gz
rails-bea737eb5a5f51ee7fbc2e60d870cee5936bdfb0.tar.bz2
rails-bea737eb5a5f51ee7fbc2e60d870cee5936bdfb0.zip
Make ActionController's render honor the :locals option when rendering a :file. Closes #1665.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3157 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/fixtures/test')
-rw-r--r--actionpack/test/fixtures/test/render_file_with_ivar.rhtml1
-rw-r--r--actionpack/test/fixtures/test/render_file_with_locals.rhtml1
2 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/test/render_file_with_ivar.rhtml b/actionpack/test/fixtures/test/render_file_with_ivar.rhtml
new file mode 100644
index 0000000000..8b8a449236
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_file_with_ivar.rhtml
@@ -0,0 +1 @@
+The secret is <%= @secret %>
diff --git a/actionpack/test/fixtures/test/render_file_with_locals.rhtml b/actionpack/test/fixtures/test/render_file_with_locals.rhtml
new file mode 100644
index 0000000000..ebe09faee6
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_file_with_locals.rhtml
@@ -0,0 +1 @@
+The secret is <%= secret %>