mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Fixed output_buffer encoding problem [#5179]
Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> Signed-off-by: José Valim <jose.valim@gmail.com>
This commit is contained in:
parent
749948a264
commit
8d5b792e7d
2 changed files with 10 additions and 1 deletions
|
@ -165,7 +165,7 @@ module ActionView
|
|||
def with_output_buffer(buf = nil) #:nodoc:
|
||||
unless buf
|
||||
buf = ActionView::OutputBuffer.new
|
||||
buf.force_encoding(output_buffer.encoding) if output_buffer && buf.respond_to?(:force_encoding)
|
||||
buf.force_encoding(output_buffer.encoding) if output_buffer.respond_to?(:encoding) && buf.respond_to?(:force_encoding)
|
||||
end
|
||||
self.output_buffer, old_buffer = buf, output_buffer
|
||||
yield
|
||||
|
|
|
@ -89,6 +89,15 @@ class JavaScriptHelperTest < ActionView::TestCase
|
|||
link_to_function("Greeting", "alert('Hello world!')", :href => 'http://example.com/')
|
||||
end
|
||||
|
||||
def test_link_to_function_with_inner_block
|
||||
html = link_to_function("Greet me!") do |page|
|
||||
content_tag :h1 do
|
||||
'Hi'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def test_javascript_tag
|
||||
self.output_buffer = 'foo'
|
||||
|
||||
|
|
Loading…
Reference in a new issue