From 293c8a4de5bfe3274e0fda7dfab1b6ec296bb829 Mon Sep 17 00:00:00 2001 From: Santiago Pastorino Date: Sat, 13 Nov 2010 13:40:36 -0200 Subject: Tests added for rendering partial with layout, when the partial contains another render layout with block call added missing fixtures --- actionpack/test/fixtures/test/_partial_with_layout.erb | 2 ++ actionpack/test/fixtures/test/_partial_with_layout_block_content.erb | 4 ++++ actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb | 4 ++++ 3 files changed, 10 insertions(+) create mode 100644 actionpack/test/fixtures/test/_partial_with_layout.erb create mode 100644 actionpack/test/fixtures/test/_partial_with_layout_block_content.erb create mode 100644 actionpack/test/fixtures/test/_partial_with_layout_block_partial.erb 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 -- cgit v1.2.3