aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/fixtures
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-11-13 13:40:36 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2010-11-13 13:40:36 -0200
commit293c8a4de5bfe3274e0fda7dfab1b6ec296bb829 (patch)
tree72628dfde017da760cbd0c478ca86e2e33c98efc /actionpack/test/fixtures
parente3b68e5f6bbdd782ae37ee0f043f0d738f518dd2 (diff)
downloadrails-293c8a4de5bfe3274e0fda7dfab1b6ec296bb829.tar.gz
rails-293c8a4de5bfe3274e0fda7dfab1b6ec296bb829.tar.bz2
rails-293c8a4de5bfe3274e0fda7dfab1b6ec296bb829.zip
Tests added for rendering partial with layout, when the partial contains another render layout with block call added missing fixtures
Diffstat (limited to 'actionpack/test/fixtures')
-rw-r--r--actionpack/test/fixtures/test/_partial_with_layout.erb2
-rw-r--r--actionpack/test/fixtures/test/_partial_with_layout_block_content.erb4
-rw-r--r--actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb4
3 files changed, 10 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/test/_partial_with_layout.erb b/actionpack/test/fixtures/test/_partial_with_layout.erb
new file mode 100644
index 0000000000..2a50c834fe
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_with_layout.erb
@@ -0,0 +1,2 @@
+<%= render :partial => 'test/partial', :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } %>
+partial with layout
diff --git a/actionpack/test/fixtures/test/_partial_with_layout_block_content.erb b/actionpack/test/fixtures/test/_partial_with_layout_block_content.erb
new file mode 100644
index 0000000000..65dafd93a8
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_with_layout_block_content.erb
@@ -0,0 +1,4 @@
+<%= render :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } do %>
+ Content from inside layout!
+<% end %>
+partial with layout
diff --git a/actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb b/actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb
new file mode 100644
index 0000000000..444197a7d0
--- /dev/null
+++ b/actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb
@@ -0,0 +1,4 @@
+<%= render :layout => 'test/layout_for_partial', :locals => { :name => 'Bar!' } do %>
+ <%= render 'test/partial' %>
+<% end %>
+partial with layout