aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-07-21 07:14:35 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-07-21 07:14:35 +0000
commitbd558ef98e17e27da51aee77fe50ef2cd129bb6e (patch)
treea421c2489f33167c4e3157c288c2d42367374a11 /actionpack/test/fixtures
parentd886ad5c8b6f9eaa8b82e634c989aee48ccaf240 (diff)
downloadrails-bd558ef98e17e27da51aee77fe50ef2cd129bb6e.tar.gz
rails-bd558ef98e17e27da51aee77fe50ef2cd129bb6e.tar.bz2
rails-bd558ef98e17e27da51aee77fe50ef2cd129bb6e.zip
Improved rendering speed on complicated templates by up to 25% #1234 [Stephan Kaes]. This did necessasitate a change to the internals of ActionView#render_template that now has four parameters. Developers of custom view handlers (like Amrita) need to update for that.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1874 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/test/_person.rhtml2
-rw-r--r--actionpack/test/fixtures/test/potential_conflicts.rhtml4
2 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/test/_person.rhtml b/actionpack/test/fixtures/test/_person.rhtml
new file mode 100644
index 0000000000..b2e5688956
--- /dev/null
+++ b/actionpack/test/fixtures/test/_person.rhtml
@@ -0,0 +1,2 @@
+Second: <%= name %>
+Third: <%= @name %>
diff --git a/actionpack/test/fixtures/test/potential_conflicts.rhtml b/actionpack/test/fixtures/test/potential_conflicts.rhtml
new file mode 100644
index 0000000000..a5e964e359
--- /dev/null
+++ b/actionpack/test/fixtures/test/potential_conflicts.rhtml
@@ -0,0 +1,4 @@
+First: <%= @name %>
+<%= render :partial => "person", :locals => { :name => "Stephan" } -%>
+Fourth: <%= @name %>
+Fifth: <%= name %> \ No newline at end of file