From 39514af7e7302dd134d015158325591c1e974d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Sat, 17 Mar 2012 07:08:49 -0700 Subject: Merge pull request #5480 from drogus/rendering-issues Fix for #5440 --- actionpack/test/fixtures/layouts/with_html_partial.html.erb | 1 + actionpack/test/fixtures/test/_partial_only_html.html | 1 + actionpack/test/fixtures/test/with_html_partial.html.erb | 1 + actionpack/test/fixtures/test/with_partial.html.erb | 1 + actionpack/test/fixtures/test/with_partial.text.erb | 1 + actionpack/test/fixtures/test/with_xml_template.html.erb | 1 + 6 files changed, 6 insertions(+) create mode 100644 actionpack/test/fixtures/layouts/with_html_partial.html.erb create mode 100644 actionpack/test/fixtures/test/_partial_only_html.html create mode 100644 actionpack/test/fixtures/test/with_html_partial.html.erb create mode 100644 actionpack/test/fixtures/test/with_partial.html.erb create mode 100644 actionpack/test/fixtures/test/with_partial.text.erb create mode 100644 actionpack/test/fixtures/test/with_xml_template.html.erb (limited to 'actionpack/test/fixtures') diff --git a/actionpack/test/fixtures/layouts/with_html_partial.html.erb b/actionpack/test/fixtures/layouts/with_html_partial.html.erb new file mode 100644 index 0000000000..fd2896aeaa --- /dev/null +++ b/actionpack/test/fixtures/layouts/with_html_partial.html.erb @@ -0,0 +1 @@ +<%= render :partial => "partial_only_html" %><%= yield %> diff --git a/actionpack/test/fixtures/test/_partial_only_html.html b/actionpack/test/fixtures/test/_partial_only_html.html new file mode 100644 index 0000000000..d2d630bd40 --- /dev/null +++ b/actionpack/test/fixtures/test/_partial_only_html.html @@ -0,0 +1 @@ +only html partial \ No newline at end of file diff --git a/actionpack/test/fixtures/test/with_html_partial.html.erb b/actionpack/test/fixtures/test/with_html_partial.html.erb new file mode 100644 index 0000000000..d84d909d64 --- /dev/null +++ b/actionpack/test/fixtures/test/with_html_partial.html.erb @@ -0,0 +1 @@ +<%= render :partial => "partial_only_html" %> diff --git a/actionpack/test/fixtures/test/with_partial.html.erb b/actionpack/test/fixtures/test/with_partial.html.erb new file mode 100644 index 0000000000..7502364cf5 --- /dev/null +++ b/actionpack/test/fixtures/test/with_partial.html.erb @@ -0,0 +1 @@ +<%= render :partial => "partial_only" %> diff --git a/actionpack/test/fixtures/test/with_partial.text.erb b/actionpack/test/fixtures/test/with_partial.text.erb new file mode 100644 index 0000000000..5f068ebf27 --- /dev/null +++ b/actionpack/test/fixtures/test/with_partial.text.erb @@ -0,0 +1 @@ +**<%= render :partial => "partial_only" %>** diff --git a/actionpack/test/fixtures/test/with_xml_template.html.erb b/actionpack/test/fixtures/test/with_xml_template.html.erb new file mode 100644 index 0000000000..e54a7cd001 --- /dev/null +++ b/actionpack/test/fixtures/test/with_xml_template.html.erb @@ -0,0 +1 @@ +<%= render :template => "test/greeting", :formats => :xml %> -- cgit v1.2.3