diff options
| author | Piotr Sarnacki <drogus@gmail.com> | 2012-03-15 03:21:10 +0100 |
|---|---|---|
| committer | Piotr Sarnacki <drogus@gmail.com> | 2012-03-17 14:15:50 +0100 |
| commit | 1eb6189404f53ae59e4cb47ef9d5ad3a9bec3064 (patch) | |
| tree | b5d31beb5c08b2b5482c7af7c1fc927c106f259e /actionpack/test/fixtures | |
| parent | e135ff1afdda064ad727691502761d7e552448a9 (diff) | |
| download | rails-1eb6189404f53ae59e4cb47ef9d5ad3a9bec3064.tar.gz rails-1eb6189404f53ae59e4cb47ef9d5ad3a9bec3064.tar.bz2 rails-1eb6189404f53ae59e4cb47ef9d5ad3a9bec3064.zip | |
Fix #5440 - multiple render_to_string breaks partials formats
This fixes situation where rendering template to string
sets `rendered_format` to the format rendered there.
This is ok to have consistent formats rendered in partials,
but it breaks on next renders if format is explicitly set
or on last render where default format does not necessarily
need to be the format of first rendered template.
Diffstat (limited to 'actionpack/test/fixtures')
4 files changed, 4 insertions, 0 deletions
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 @@ +<strong><%= render :partial => "partial_only_html" %></strong> 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 @@ +<strong><%= render :partial => "partial_only" %></strong> 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" %>** |