aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/examples/address_book/index.erb33
-rw-r--r--actionpack/examples/address_book/layout.erb8
-rw-r--r--actionpack/examples/debate/index.erb14
-rw-r--r--actionpack/examples/debate/new_topic.erb22
-rw-r--r--actionpack/examples/debate/topic.erb32
-rw-r--r--actionpack/lib/action_controller/templates/rescues/_request_and_response.erb44
-rw-r--r--actionpack/lib/action_controller/templates/rescues/_trace.erb26
-rw-r--r--actionpack/lib/action_controller/templates/rescues/diagnostics.erb11
-rw-r--r--actionpack/lib/action_controller/templates/rescues/layout.erb29
-rw-r--r--actionpack/lib/action_controller/templates/rescues/missing_template.erb2
-rw-r--r--actionpack/lib/action_controller/templates/rescues/routing_error.erb10
-rw-r--r--actionpack/lib/action_controller/templates/rescues/template_error.erb21
-rw-r--r--actionpack/lib/action_controller/templates/rescues/unknown_action.erb2
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/edit.erb7
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/layout.erb69
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/list.erb27
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/new.erb6
-rw-r--r--actionpack/lib/action_controller/templates/scaffolds/show.erb9
-rw-r--r--actionpack/test/fixtures/addresses/list.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_flash_ivar.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_flash_method.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_headers_ivar.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_headers_method.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_params_ivar.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_params_method.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_request_ivar.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_request_method.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_response_ivar.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_response_method.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_session_ivar.erb1
-rw-r--r--actionpack/test/fixtures/deprecated_instance_variables/_session_method.erb1
-rw-r--r--actionpack/test/fixtures/fun/games/hello_world.erb1
-rw-r--r--actionpack/test/fixtures/layouts/builder.builder3
-rw-r--r--actionpack/test/fixtures/layouts/standard.erb1
-rw-r--r--actionpack/test/fixtures/layouts/talk_from_action.erb2
-rw-r--r--actionpack/test/fixtures/layouts/yield.erb2
-rw-r--r--actionpack/test/fixtures/override/test/hello_world.erb1
-rw-r--r--actionpack/test/fixtures/scope/test/modgreet.erb1
-rw-r--r--actionpack/test/fixtures/test/_customer.erb1
-rw-r--r--actionpack/test/fixtures/test/_customer_greeting.erb1
-rw-r--r--actionpack/test/fixtures/test/_hash_object.erb1
-rw-r--r--actionpack/test/fixtures/test/_hello.builder1
-rw-r--r--actionpack/test/fixtures/test/_partial_only.erb1
-rw-r--r--actionpack/test/fixtures/test/_person.erb2
-rw-r--r--actionpack/test/fixtures/test/action_talk_to_layout.erb2
-rw-r--r--actionpack/test/fixtures/test/block_content_for.erb2
-rw-r--r--actionpack/test/fixtures/test/capturing.erb4
-rw-r--r--actionpack/test/fixtures/test/content_for.erb2
-rw-r--r--actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.erb1
-rw-r--r--actionpack/test/fixtures/test/erb_content_for.erb2
-rw-r--r--actionpack/test/fixtures/test/greeting.erb1
-rw-r--r--actionpack/test/fixtures/test/hello.builder4
-rw-r--r--actionpack/test/fixtures/test/hello_world.builder3
-rw-r--r--actionpack/test/fixtures/test/hello_world.erb1
-rw-r--r--actionpack/test/fixtures/test/hello_world_container.builder3
-rw-r--r--actionpack/test/fixtures/test/hello_world_with_layout_false.erb1
-rw-r--r--actionpack/test/fixtures/test/hello_xml_world.builder11
-rw-r--r--actionpack/test/fixtures/test/list.erb1
-rw-r--r--actionpack/test/fixtures/test/non_erb_block_content_for.builder4
-rw-r--r--actionpack/test/fixtures/test/potential_conflicts.erb4
-rw-r--r--actionpack/test/fixtures/test/render_file_with_ivar.erb1
-rw-r--r--actionpack/test/fixtures/test/render_file_with_locals.erb1
-rw-r--r--actionpack/test/fixtures/test/render_to_string_test.erb1
-rw-r--r--actionpack/test/fixtures/test/update_element_with_capture.erb9
66 files changed, 463 insertions, 0 deletions
diff --git a/actionpack/examples/address_book/index.erb b/actionpack/examples/address_book/index.erb
new file mode 100644
index 0000000000..217d39075c
--- /dev/null
+++ b/actionpack/examples/address_book/index.erb
@@ -0,0 +1,33 @@
+<h1>Address Book</h1>
+
+<% if @people.empty? %>
+ <p>No people in the address book yet</p>
+<% else %>
+ <table>
+ <tr><th>Name</th><th>Email Address</th><th>Phone Number</th></tr>
+ <% for person in @people %>
+ <tr><td><%= person.name %></td><td><%= person.email_address %></td><td><%= person.phone_number %></td></tr>
+ <% end %>
+ </table>
+<% end %>
+
+<form action="create_person">
+ <p>
+ Name:<br />
+ <input type="text" name="person[name]">
+ </p>
+
+ <p>
+ Email address:<br />
+ <input type="text" name="person[email_address]">
+ </p>
+
+ <p>
+ Phone number:<br />
+ <input type="text" name="person[phone_number]">
+ </p>
+
+ <p>
+ <input type="submit" value="Create Person">
+ </p>
+</form> \ No newline at end of file
diff --git a/actionpack/examples/address_book/layout.erb b/actionpack/examples/address_book/layout.erb
new file mode 100644
index 0000000000..931e141c01
--- /dev/null
+++ b/actionpack/examples/address_book/layout.erb
@@ -0,0 +1,8 @@
+<html>
+<head>
+ <title><%= @title || "Untitled" %></title>
+</head>
+<body>
+<%= @content_for_layout %>
+</body>
+</html> \ No newline at end of file
diff --git a/actionpack/examples/debate/index.erb b/actionpack/examples/debate/index.erb
new file mode 100644
index 0000000000..ddaa87da57
--- /dev/null
+++ b/actionpack/examples/debate/index.erb
@@ -0,0 +1,14 @@
+<html>
+<body>
+<h1>Topics</h1>
+
+<%= link_to "New topic", :action => "new_topic" %>
+
+<ul>
+<% for topic in @topics %>
+ <li><%= link_to "#{topic.title} (#{topic.replies.length} replies)", :action => "topic", :path_params => { "id" => topic.id } %></li>
+<% end %>
+</ul>
+
+</body>
+</html> \ No newline at end of file
diff --git a/actionpack/examples/debate/new_topic.erb b/actionpack/examples/debate/new_topic.erb
new file mode 100644
index 0000000000..f52a69cc31
--- /dev/null
+++ b/actionpack/examples/debate/new_topic.erb
@@ -0,0 +1,22 @@
+<html>
+<body>
+<h1>New topic</h1>
+
+<form action="<%= url_for(:action => "create_topic") %>" method="post">
+ <p>
+ Title:<br>
+ <input type="text" name="topic[title]">
+ </p>
+
+ <p>
+ Body:<br>
+ <textarea name="topic[body]" style="width: 200px; height: 200px"></textarea>
+ </p>
+
+ <p>
+ <input type="submit" value="Create topic">
+ </p>
+</form>
+
+</body>
+</html> \ No newline at end of file
diff --git a/actionpack/examples/debate/topic.erb b/actionpack/examples/debate/topic.erb
new file mode 100644
index 0000000000..e247c00f0d
--- /dev/null
+++ b/actionpack/examples/debate/topic.erb
@@ -0,0 +1,32 @@
+<html>
+<body>
+<h1><%= @topic.title %></h1>
+
+<p><%= @topic.body %></p>
+
+<%= link_to "Back to topics", :action => "index" %>
+
+<% unless @topic.replies.empty? %>
+ <h2>Replies</h2>
+ <ol>
+ <% for reply in @topic.replies %>
+ <li><%= reply.body %></li>
+ <% end %>
+ </ol>
+<% end %>
+
+<h2>Reply to this topic</h2>
+
+<form action="<%= url_for(:action => "create_reply") %>" method="post">
+ <input type="hidden" name="reply[topic_id]" value="<%= @topic.id %>">
+ <p>
+ <textarea name="reply[body]" style="width: 200px; height: 200px"></textarea>
+ </p>
+
+ <p>
+ <input type="submit" value="Create reply">
+ </p>
+</form>
+
+</body>
+</html> \ No newline at end of file
diff --git a/actionpack/lib/action_controller/templates/rescues/_request_and_response.erb b/actionpack/lib/action_controller/templates/rescues/_request_and_response.erb
new file mode 100644
index 0000000000..fe60bfdd40
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/rescues/_request_and_response.erb
@@ -0,0 +1,44 @@
+<% unless @exception.blamed_files.blank? %>
+ <% if (hide = @exception.blamed_files.length > 8) %>
+ <a href="#" onclick="document.getElementById('blame_trace').style.display='block'; return false;">Show blamed files</a>
+ <% end %>
+ <pre id="blame_trace" <%='style="display:none"' if hide %>><code><%=h @exception.describe_blame %></code></pre>
+<% end %>
+
+<% if false %>
+ <br /><br />
+ <% begin %>
+ <%= form_tag(request.request_uri, "method" => request.method) %>
+ <input type="hidden" name="BP-RETRY" value="1" />
+
+ <% for key, values in params %>
+ <% next if key == "BP-RETRY" %>
+ <% for value in Array(values) %>
+ <input type="hidden" name="<%= key %>" value="<%= value %>" />
+ <% end %>
+ <% end %>
+
+ <input type="submit" value="Retry with Breakpoint" />
+ </form>
+ <% rescue Exception => e %>
+ <%=h "Couldn't render breakpoint link due to #{e.class} #{e.message}" %>
+ <% end %>
+<% end %>
+
+<%
+ clean_params = request.parameters.clone
+ clean_params.delete("action")
+ clean_params.delete("controller")
+
+ request_dump = clean_params.empty? ? 'None' : clean_params.inspect.gsub(',', ",\n")
+%>
+
+<h2 style="margin-top: 30px">Request</h2>
+<p><b>Parameters</b>: <pre><%=h request_dump %></pre></p>
+
+<p><a href="#" onclick="document.getElementById('session_dump').style.display='block'; return false;">Show session dump</a></p>
+<div id="session_dump" style="display:none"><%= debug(request.session.instance_variable_get("@data")) %></div>
+
+
+<h2 style="margin-top: 30px">Response</h2>
+<p><b>Headers</b>: <pre><%=h response ? response.headers.inspect.gsub(',', ",\n") : 'None' %></pre></p>
diff --git a/actionpack/lib/action_controller/templates/rescues/_trace.erb b/actionpack/lib/action_controller/templates/rescues/_trace.erb
new file mode 100644
index 0000000000..b322b0aaae
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/rescues/_trace.erb
@@ -0,0 +1,26 @@
+<%
+ traces = [
+ ["Application Trace", @exception.application_backtrace],
+ ["Framework Trace", @exception.framework_backtrace],
+ ["Full Trace", @exception.clean_backtrace]
+ ]
+ names = traces.collect {|name, trace| name}
+%>
+
+<p><code>RAILS_ROOT: <%= defined?(RAILS_ROOT) ? RAILS_ROOT : "unset" %></code></p>
+
+<div id="traces">
+ <% names.each do |name| -%>
+ <%
+ show = "document.getElementById('#{name.gsub /\s/, '-'}').style.display='block';"
+ hide = (names - [name]).collect {|hide_name| "document.getElementById('#{hide_name.gsub /\s/, '-'}').style.display='none';"}
+ %>
+ <a href="#" onclick="<%= hide %><%= show %>; return false;"><%= name %></a> <%= '|' unless names.last == name %>
+ <% end -%>
+
+ <% traces.each do |name, trace| -%>
+ <div id="<%= name.gsub /\s/, '-' %>" style="display: <%= name == "Application Trace" ? 'block' : 'none' %>;">
+ <pre><code><%= trace.join "\n" %></code></pre>
+ </div>
+ <% end -%>
+</div> \ No newline at end of file
diff --git a/actionpack/lib/action_controller/templates/rescues/diagnostics.erb b/actionpack/lib/action_controller/templates/rescues/diagnostics.erb
new file mode 100644
index 0000000000..032f945ed2
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/rescues/diagnostics.erb
@@ -0,0 +1,11 @@
+<h1>
+ <%=h @exception.class.to_s %>
+ <% if request.parameters['controller'] %>
+ in <%=h request.parameters['controller'].humanize %>Controller<% if request.parameters['action'] %>#<%=h request.parameters['action'] %><% end %>
+ <% end %>
+</h1>
+<pre><%=h @exception.clean_message %></pre>
+
+<%= render_file(@rescues_path + "/_trace.erb", false) %>
+
+<%= render_file(@rescues_path + "/_request_and_response.erb", false) %>
diff --git a/actionpack/lib/action_controller/templates/rescues/layout.erb b/actionpack/lib/action_controller/templates/rescues/layout.erb
new file mode 100644
index 0000000000..d38f3e67f9
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/rescues/layout.erb
@@ -0,0 +1,29 @@
+<html>
+<head>
+ <title>Action Controller: Exception caught</title>
+ <style>
+ body { background-color: #fff; color: #333; }
+
+ body, p, ol, ul, td {
+ font-family: verdana, arial, helvetica, sans-serif;
+ font-size: 13px;
+ line-height: 18px;
+ }
+
+ pre {
+ background-color: #eee;
+ padding: 10px;
+ font-size: 11px;
+ }
+
+ a { color: #000; }
+ a:visited { color: #666; }
+ a:hover { color: #fff; background-color:#000; }
+ </style>
+</head>
+<body>
+
+<%= @contents %>
+
+</body>
+</html> \ No newline at end of file
diff --git a/actionpack/lib/action_controller/templates/rescues/missing_template.erb b/actionpack/lib/action_controller/templates/rescues/missing_template.erb
new file mode 100644
index 0000000000..dbfdf76947
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/rescues/missing_template.erb
@@ -0,0 +1,2 @@
+<h1>Template is missing</h1>
+<p><%=h @exception.message %></p>
diff --git a/actionpack/lib/action_controller/templates/rescues/routing_error.erb b/actionpack/lib/action_controller/templates/rescues/routing_error.erb
new file mode 100644
index 0000000000..ccfa858cce
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/rescues/routing_error.erb
@@ -0,0 +1,10 @@
+<h1>Routing Error</h1>
+<p><pre><%=h @exception.message %></pre></p>
+<% unless @exception.failures.empty? %><p>
+ <h2>Failure reasons:</h2>
+ <ol>
+ <% @exception.failures.each do |route, reason| %>
+ <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li>
+ <% end %>
+ </ol>
+</p><% end %>
diff --git a/actionpack/lib/action_controller/templates/rescues/template_error.erb b/actionpack/lib/action_controller/templates/rescues/template_error.erb
new file mode 100644
index 0000000000..eda64db3e9
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/rescues/template_error.erb
@@ -0,0 +1,21 @@
+<h1>
+ <%=h @exception.original_exception.class.to_s %> in
+ <%=h request.parameters["controller"].capitalize if request.parameters["controller"]%>#<%=h request.parameters["action"] %>
+</h1>
+
+<p>
+ Showing <i><%=h @exception.file_name %></i> where line <b>#<%=h @exception.line_number %></b> raised:
+ <pre><code><%=h @exception.message %></code></pre>
+</p>
+
+<p>Extracted source (around line <b>#<%=h @exception.line_number %></b>):
+<pre><code><%=h @exception.source_extract %></code></pre></p>
+
+<p><%=h @exception.sub_template_message %></p>
+
+<% @real_exception = @exception
+ @exception = @exception.original_exception || @exception %>
+<%= render_file(@rescues_path + "/_trace.erb", false) %>
+<% @exception = @real_exception %>
+
+<%= render_file(@rescues_path + "/_request_and_response.erb", false) %>
diff --git a/actionpack/lib/action_controller/templates/rescues/unknown_action.erb b/actionpack/lib/action_controller/templates/rescues/unknown_action.erb
new file mode 100644
index 0000000000..683379da10
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/rescues/unknown_action.erb
@@ -0,0 +1,2 @@
+<h1>Unknown action</h1>
+<p><%=h @exception.message %></p>
diff --git a/actionpack/lib/action_controller/templates/scaffolds/edit.erb b/actionpack/lib/action_controller/templates/scaffolds/edit.erb
new file mode 100644
index 0000000000..63dff602a1
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/scaffolds/edit.erb
@@ -0,0 +1,7 @@
+<h1>Editing <%= @scaffold_singular_name %></h1>
+
+<%= error_messages_for(@scaffold_singular_name) %>
+<%= form(@scaffold_singular_name, :action => "update#{@scaffold_suffix}") %>
+
+<%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}") %> |
+<%= link_to "Back", :action => "list#{@scaffold_suffix}" %>
diff --git a/actionpack/lib/action_controller/templates/scaffolds/layout.erb b/actionpack/lib/action_controller/templates/scaffolds/layout.erb
new file mode 100644
index 0000000000..759781e0e7
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/scaffolds/layout.erb
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+ <title>Scaffolding</title>
+ <style>
+ body { background-color: #fff; color: #333; }
+
+ body, p, ol, ul, td {
+ font-family: verdana, arial, helvetica, sans-serif;
+ font-size: 13px;
+ line-height: 18px;
+ }
+
+ pre {
+ background-color: #eee;
+ padding: 10px;
+ font-size: 11px;
+ }
+
+ a { color: #000; }
+ a:visited { color: #666; }
+ a:hover { color: #fff; background-color:#000; }
+
+ .fieldWithErrors {
+ padding: 2px;
+ background-color: red;
+ display: table;
+ }
+
+ #errorExplanation {
+ width: 400px;
+ border: 2px solid red;
+ padding: 7px;
+ padding-bottom: 12px;
+ margin-bottom: 20px;
+ background-color: #f0f0f0;
+ }
+
+ #errorExplanation h2 {
+ text-align: left;
+ font-weight: bold;
+ padding: 5px 5px 5px 15px;
+ font-size: 12px;
+ margin: -7px;
+ background-color: #c00;
+ color: #fff;
+ }
+
+ #errorExplanation p {
+ color: #333;
+ margin-bottom: 0;
+ padding: 5px;
+ }
+
+ #errorExplanation ul li {
+ font-size: 12px;
+ list-style: square;
+ }
+ </style>
+</head>
+<body>
+
+<p style="color: green"><%= flash[:notice] %></p>
+
+<%= yield %>
+
+</body>
+</html>
diff --git a/actionpack/lib/action_controller/templates/scaffolds/list.erb b/actionpack/lib/action_controller/templates/scaffolds/list.erb
new file mode 100644
index 0000000000..fea23dc66f
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/scaffolds/list.erb
@@ -0,0 +1,27 @@
+<h1>Listing <%= @scaffold_plural_name %></h1>
+
+<table>
+ <tr>
+ <% for column in @scaffold_class.content_columns %>
+ <th><%= column.human_name %></th>
+ <% end %>
+ </tr>
+
+<% for entry in instance_variable_get("@#{@scaffold_plural_name}") %>
+ <tr>
+ <% for column in @scaffold_class.content_columns %>
+ <td><%= entry.send(column.name) %></td>
+ <% end %>
+ <td><%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => entry %></td>
+ <td><%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => entry %></td>
+ <td><%= link_to "Destroy", {:action => "destroy#{@scaffold_suffix}", :id => entry}, { :confirm => "Are you sure?", :method => :post } %></td>
+ </tr>
+<% end %>
+</table>
+
+<%= link_to "Previous page", { :page => instance_variable_get("@#{@scaffold_singular_name}_pages").current.previous } if instance_variable_get("@#{@scaffold_singular_name}_pages").current.previous %>
+<%= link_to "Next page", { :page => instance_variable_get("@#{@scaffold_singular_name}_pages").current.next } if instance_variable_get("@#{@scaffold_singular_name}_pages").current.next %>
+
+<br />
+
+<%= link_to "New #{@scaffold_singular_name}", :action => "new#{@scaffold_suffix}" %>
diff --git a/actionpack/lib/action_controller/templates/scaffolds/new.erb b/actionpack/lib/action_controller/templates/scaffolds/new.erb
new file mode 100644
index 0000000000..66f6626f4e
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/scaffolds/new.erb
@@ -0,0 +1,6 @@
+<h1>New <%= @scaffold_singular_name %></h1>
+
+<%= error_messages_for(@scaffold_singular_name) %>
+<%= form(@scaffold_singular_name, :action => "create#{@scaffold_suffix}") %>
+
+<%= link_to "Back", :action => "list#{@scaffold_suffix}" %>
diff --git a/actionpack/lib/action_controller/templates/scaffolds/show.erb b/actionpack/lib/action_controller/templates/scaffolds/show.erb
new file mode 100644
index 0000000000..46cdfdb493
--- /dev/null
+++ b/actionpack/lib/action_controller/templates/scaffolds/show.erb
@@ -0,0 +1,9 @@
+<% for column in @scaffold_class.content_columns %>
+ <p>
+ <b><%= column.human_name %>:</b>
+ <%= instance_variable_get("@#{@scaffold_singular_name}").send(column.name) %>
+ </p>
+<% end %>
+
+<%= link_to "Edit", :action => "edit#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}") %> |
+<%= link_to "Back", :action => "list#{@scaffold_suffix}" %>
diff --git a/actionpack/test/fixtures/addresses/list.erb b/actionpack/test/fixtures/addresses/list.erb
new file mode 100644
index 0000000000..c75e01eece
--- /dev/null
+++ b/actionpack/test/fixtures/addresses/list.erb
@@ -0,0 +1 @@
+We only need to get this far!
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.erb b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.erb
new file mode 100644
index 0000000000..4e8a2d804c
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_ivar.erb
@@ -0,0 +1 @@
+<%= @cookies[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.erb b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.erb
new file mode 100644
index 0000000000..68e88bb746
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_cookies_method.erb
@@ -0,0 +1 @@
+<%= cookies[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_flash_ivar.erb b/actionpack/test/fixtures/deprecated_instance_variables/_flash_ivar.erb
new file mode 100644
index 0000000000..4b4782b287
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_flash_ivar.erb
@@ -0,0 +1 @@
+<%= @flash[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_flash_method.erb b/actionpack/test/fixtures/deprecated_instance_variables/_flash_method.erb
new file mode 100644
index 0000000000..f7f9d0913a
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_flash_method.erb
@@ -0,0 +1 @@
+<%= flash[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_headers_ivar.erb b/actionpack/test/fixtures/deprecated_instance_variables/_headers_ivar.erb
new file mode 100644
index 0000000000..1176c93ad8
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_headers_ivar.erb
@@ -0,0 +1 @@
+<%= @headers[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_headers_method.erb b/actionpack/test/fixtures/deprecated_instance_variables/_headers_method.erb
new file mode 100644
index 0000000000..308c4eb6ba
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_headers_method.erb
@@ -0,0 +1 @@
+<%= headers[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_params_ivar.erb b/actionpack/test/fixtures/deprecated_instance_variables/_params_ivar.erb
new file mode 100644
index 0000000000..1eea68757f
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_params_ivar.erb
@@ -0,0 +1 @@
+<%= @params[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_params_method.erb b/actionpack/test/fixtures/deprecated_instance_variables/_params_method.erb
new file mode 100644
index 0000000000..7e349b4ca0
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_params_method.erb
@@ -0,0 +1 @@
+<%= params[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_request_ivar.erb b/actionpack/test/fixtures/deprecated_instance_variables/_request_ivar.erb
new file mode 100644
index 0000000000..a1680c23d5
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_request_ivar.erb
@@ -0,0 +1 @@
+<%= @request.method %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_request_method.erb b/actionpack/test/fixtures/deprecated_instance_variables/_request_method.erb
new file mode 100644
index 0000000000..0c74cf1c1b
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_request_method.erb
@@ -0,0 +1 @@
+<%= request.method %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_response_ivar.erb b/actionpack/test/fixtures/deprecated_instance_variables/_response_ivar.erb
new file mode 100644
index 0000000000..2f12d2ce32
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_response_ivar.erb
@@ -0,0 +1 @@
+<%= @response.body %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_response_method.erb b/actionpack/test/fixtures/deprecated_instance_variables/_response_method.erb
new file mode 100644
index 0000000000..948c75929a
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_response_method.erb
@@ -0,0 +1 @@
+<%= response.body %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_session_ivar.erb b/actionpack/test/fixtures/deprecated_instance_variables/_session_ivar.erb
new file mode 100644
index 0000000000..3acc1b8529
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_session_ivar.erb
@@ -0,0 +1 @@
+<%= @session[:test] %>
diff --git a/actionpack/test/fixtures/deprecated_instance_variables/_session_method.erb b/actionpack/test/fixtures/deprecated_instance_variables/_session_method.erb
new file mode 100644
index 0000000000..a899387c47
--- /dev/null
+++ b/actionpack/test/fixtures/deprecated_instance_variables/_session_method.erb
@@ -0,0 +1 @@
+<%= session[:test] %>
diff --git a/actionpack/test/fixtures/fun/games/hello_world.erb b/actionpack/test/fixtures/fun/games/hello_world.erb
new file mode 100644
index 0000000000..1ebfbe2539
--- /dev/null
+++ b/actionpack/test/fixtures/fun/games/hello_world.erb
@@ -0,0 +1 @@
+Living in a nested world \ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/builder.builder b/actionpack/test/fixtures/layouts/builder.builder
new file mode 100644
index 0000000000..729af4b8bc
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/builder.builder
@@ -0,0 +1,3 @@
+xml.wrapper do
+ xml << @content_for_layout
+end \ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/standard.erb b/actionpack/test/fixtures/layouts/standard.erb
new file mode 100644
index 0000000000..368764e6f4
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/standard.erb
@@ -0,0 +1 @@
+<html><%= @content_for_layout %><%= @variable_for_layout %></html> \ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/talk_from_action.erb b/actionpack/test/fixtures/layouts/talk_from_action.erb
new file mode 100644
index 0000000000..187aab07a2
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/talk_from_action.erb
@@ -0,0 +1,2 @@
+<title><%= @title || @content_for_title %></title>
+<%= @content_for_layout -%> \ No newline at end of file
diff --git a/actionpack/test/fixtures/layouts/yield.erb b/actionpack/test/fixtures/layouts/yield.erb
new file mode 100644
index 0000000000..482dc9022e
--- /dev/null
+++ b/actionpack/test/fixtures/layouts/yield.erb
@@ -0,0 +1,2 @@
+<title><%= yield :title %></title>
+<%= yield %>
diff --git a/actionpack/test/fixtures/override/test/hello_world.erb b/actionpack/test/fixtures/override/test/hello_world.erb
new file mode 100644
index 0000000000..3e308d3d86
--- /dev/null
+++ b/actionpack/test/fixtures/override/test/hello_world.erb
@@ -0,0 +1 @@
+Hello overridden world! \ No newline at end of file
diff --git a/actionpack/test/fixtures/scope/test/modgreet.erb b/actionpack/test/fixtures/scope/test/modgreet.erb
new file mode 100644
index 0000000000..8947726e89
--- /dev/null
+++ b/actionpack/test/fixtures/scope/test/modgreet.erb
@@ -0,0 +1 @@
+<p>Beautiful modules!</p> \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer.erb b/actionpack/test/fixtures/test/_customer.erb
new file mode 100644
index 0000000000..872d8c44e6
--- /dev/null
+++ b/actionpack/test/fixtures/test/_customer.erb
@@ -0,0 +1 @@
+Hello: <%= customer.name %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_customer_greeting.erb b/actionpack/test/fixtures/test/_customer_greeting.erb
new file mode 100644
index 0000000000..6acbcb20c4
--- /dev/null
+++ b/actionpack/test/fixtures/test/_customer_greeting.erb
@@ -0,0 +1 @@
+<%= greeting %>: <%= customer_greeting.name %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_hash_object.erb b/actionpack/test/fixtures/test/_hash_object.erb
new file mode 100644
index 0000000000..037a7368d6
--- /dev/null
+++ b/actionpack/test/fixtures/test/_hash_object.erb
@@ -0,0 +1 @@
+<%= hash_object[:first_name] %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_hello.builder b/actionpack/test/fixtures/test/_hello.builder
new file mode 100644
index 0000000000..ef52f632d1
--- /dev/null
+++ b/actionpack/test/fixtures/test/_hello.builder
@@ -0,0 +1 @@
+xm.hello \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_partial_only.erb b/actionpack/test/fixtures/test/_partial_only.erb
new file mode 100644
index 0000000000..a44b3eed40
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_only.erb
@@ -0,0 +1 @@
+only partial \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/_person.erb b/actionpack/test/fixtures/test/_person.erb
new file mode 100644
index 0000000000..b2e5688956
--- /dev/null
+++ b/actionpack/test/fixtures/test/_person.erb
@@ -0,0 +1,2 @@
+Second: <%= name %>
+Third: <%= @name %>
diff --git a/actionpack/test/fixtures/test/action_talk_to_layout.erb b/actionpack/test/fixtures/test/action_talk_to_layout.erb
new file mode 100644
index 0000000000..36e896daa8
--- /dev/null
+++ b/actionpack/test/fixtures/test/action_talk_to_layout.erb
@@ -0,0 +1,2 @@
+<% @title = "Talking to the layout" -%>
+Action was here! \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/block_content_for.erb b/actionpack/test/fixtures/test/block_content_for.erb
new file mode 100644
index 0000000000..9510337365
--- /dev/null
+++ b/actionpack/test/fixtures/test/block_content_for.erb
@@ -0,0 +1,2 @@
+<% block_content_for :title do 'Putting stuff in the title!' end %>
+Great stuff! \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/capturing.erb b/actionpack/test/fixtures/test/capturing.erb
new file mode 100644
index 0000000000..1addaa40d9
--- /dev/null
+++ b/actionpack/test/fixtures/test/capturing.erb
@@ -0,0 +1,4 @@
+<% days = capture do %>
+ Dreamy days
+<% end %>
+<%= days %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/content_for.erb b/actionpack/test/fixtures/test/content_for.erb
new file mode 100644
index 0000000000..0e47ca8c3d
--- /dev/null
+++ b/actionpack/test/fixtures/test/content_for.erb
@@ -0,0 +1,2 @@
+<% content_for :title do %>Putting stuff in the title!<% end %>
+Great stuff! \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.erb b/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.erb
new file mode 100644
index 0000000000..8b8a449236
--- /dev/null
+++ b/actionpack/test/fixtures/test/dot.directory/render_file_with_ivar.erb
@@ -0,0 +1 @@
+The secret is <%= @secret %>
diff --git a/actionpack/test/fixtures/test/erb_content_for.erb b/actionpack/test/fixtures/test/erb_content_for.erb
new file mode 100644
index 0000000000..c3bdd13643
--- /dev/null
+++ b/actionpack/test/fixtures/test/erb_content_for.erb
@@ -0,0 +1,2 @@
+<% erb_content_for :title do %>Putting stuff in the title!<% end %>
+Great stuff! \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/greeting.erb b/actionpack/test/fixtures/test/greeting.erb
new file mode 100644
index 0000000000..62fb0293f0
--- /dev/null
+++ b/actionpack/test/fixtures/test/greeting.erb
@@ -0,0 +1 @@
+<p>This is grand!</p>
diff --git a/actionpack/test/fixtures/test/hello.builder b/actionpack/test/fixtures/test/hello.builder
new file mode 100644
index 0000000000..82a4a310d3
--- /dev/null
+++ b/actionpack/test/fixtures/test/hello.builder
@@ -0,0 +1,4 @@
+xml.html do
+ xml.p "Hello #{@name}"
+ xml << render_file("test/greeting")
+end \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world.builder b/actionpack/test/fixtures/test/hello_world.builder
new file mode 100644
index 0000000000..bffd2191ba
--- /dev/null
+++ b/actionpack/test/fixtures/test/hello_world.builder
@@ -0,0 +1,3 @@
+xml.html do
+ xml.p "Hello"
+end \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world.erb b/actionpack/test/fixtures/test/hello_world.erb
new file mode 100644
index 0000000000..6769dd60bd
--- /dev/null
+++ b/actionpack/test/fixtures/test/hello_world.erb
@@ -0,0 +1 @@
+Hello world! \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world_container.builder b/actionpack/test/fixtures/test/hello_world_container.builder
new file mode 100644
index 0000000000..e48d75c405
--- /dev/null
+++ b/actionpack/test/fixtures/test/hello_world_container.builder
@@ -0,0 +1,3 @@
+xml.test do
+ render :partial => 'hello', :locals => { :xm => xml }
+end \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_world_with_layout_false.erb b/actionpack/test/fixtures/test/hello_world_with_layout_false.erb
new file mode 100644
index 0000000000..6769dd60bd
--- /dev/null
+++ b/actionpack/test/fixtures/test/hello_world_with_layout_false.erb
@@ -0,0 +1 @@
+Hello world! \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/hello_xml_world.builder b/actionpack/test/fixtures/test/hello_xml_world.builder
new file mode 100644
index 0000000000..02b14fe87c
--- /dev/null
+++ b/actionpack/test/fixtures/test/hello_xml_world.builder
@@ -0,0 +1,11 @@
+xml.html do
+ xml.head do
+ xml.title "Hello World"
+ end
+
+ xml.body do
+ xml.p "abes"
+ xml.p "monks"
+ xml.p "wiseguys"
+ end
+end \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/list.erb b/actionpack/test/fixtures/test/list.erb
new file mode 100644
index 0000000000..cd0ab45d26
--- /dev/null
+++ b/actionpack/test/fixtures/test/list.erb
@@ -0,0 +1 @@
+<%= @test_unchanged = 'goodbye' %><%= render_collection_of_partials "customer", @customers %><%= @test_unchanged %>
diff --git a/actionpack/test/fixtures/test/non_erb_block_content_for.builder b/actionpack/test/fixtures/test/non_erb_block_content_for.builder
new file mode 100644
index 0000000000..6ff6db0f95
--- /dev/null
+++ b/actionpack/test/fixtures/test/non_erb_block_content_for.builder
@@ -0,0 +1,4 @@
+content_for :title do
+ 'Putting stuff in the title!'
+end
+xml << "\nGreat stuff!" \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/potential_conflicts.erb b/actionpack/test/fixtures/test/potential_conflicts.erb
new file mode 100644
index 0000000000..a5e964e359
--- /dev/null
+++ b/actionpack/test/fixtures/test/potential_conflicts.erb
@@ -0,0 +1,4 @@
+First: <%= @name %>
+<%= render :partial => "person", :locals => { :name => "Stephan" } -%>
+Fourth: <%= @name %>
+Fifth: <%= name %> \ No newline at end of file
diff --git a/actionpack/test/fixtures/test/render_file_with_ivar.erb b/actionpack/test/fixtures/test/render_file_with_ivar.erb
new file mode 100644
index 0000000000..8b8a449236
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_file_with_ivar.erb
@@ -0,0 +1 @@
+The secret is <%= @secret %>
diff --git a/actionpack/test/fixtures/test/render_file_with_locals.erb b/actionpack/test/fixtures/test/render_file_with_locals.erb
new file mode 100644
index 0000000000..ebe09faee6
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_file_with_locals.erb
@@ -0,0 +1 @@
+The secret is <%= secret %>
diff --git a/actionpack/test/fixtures/test/render_to_string_test.erb b/actionpack/test/fixtures/test/render_to_string_test.erb
new file mode 100644
index 0000000000..6e267e8634
--- /dev/null
+++ b/actionpack/test/fixtures/test/render_to_string_test.erb
@@ -0,0 +1 @@
+The value of foo is: ::<%= @foo %>::
diff --git a/actionpack/test/fixtures/test/update_element_with_capture.erb b/actionpack/test/fixtures/test/update_element_with_capture.erb
new file mode 100644
index 0000000000..fa3ef200f9
--- /dev/null
+++ b/actionpack/test/fixtures/test/update_element_with_capture.erb
@@ -0,0 +1,9 @@
+<% replacement_function = update_element_function("products", :action => :update) do %>
+ <p>Product 1</p>
+ <p>Product 2</p>
+<% end %>
+<%= javascript_tag(replacement_function) %>
+
+<% update_element_function("status", :action => :update, :binding => binding) do %>
+ <b>You bought something!</b>
+<% end %>