Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Basic tests for streaming. Basic tests for provide.

  • Loading branch information...
commit 29078ff8f1561420a405384772c051dc30bdcbf6 1 parent 62668cc
@josevalim josevalim authored
View
2  actionpack/lib/action_view/flows.rb
@@ -13,7 +13,7 @@ def get(key)
end
def set(key, value)
- @content[key] = value
+ @content[key] = (ActiveSupport::SafeBuffer.new << value)
end
def append(key, value)
View
2  actionpack/lib/action_view/renderer/streaming_template_renderer.rb
@@ -20,7 +20,7 @@ def each(&block)
# object that responds to each. This object is initialized with a block
# that knows how to render the template.
def render_template(template, layout_name = nil, locals = {}) #:nodoc:
- return [super] unless template.supports_streaming?
+ return [super] unless layout_name && template.supports_streaming?
locals ||= {}
layout = layout_name && find_layout(layout_name, locals.keys)
View
11 actionpack/test/template/capture_helper_test.rb
@@ -45,6 +45,17 @@ def test_content_for
assert ! content_for?(:something_else)
end
+ def test_provide
+ assert !content_for?(:title)
+ provide :title, "title"
+ assert content_for?(:title)
+ assert_equal "title", @_view_flow.get(:title)
+ provide :title, "<p>title</p>"
+ assert_equal "&lt;p&gt;title&lt;/p&gt;", @_view_flow.get(:title)
+ provide :title, "<p>title</p>".html_safe
+ assert_equal "<p>title</p>", @_view_flow.get(:title)
+ end
+
def test_with_output_buffer_swaps_the_output_buffer_given_no_argument
assert_nil @av.output_buffer
buffer = @av.with_output_buffer do
View
60 actionpack/test/template/streaming_render_test.rb
@@ -22,12 +22,68 @@ def buffered_render(options)
string
end
- def test_render_template_without_layout
+ def test_streaming_works
+ content = []
+ body = @view.render_body(:template => "test/hello_world.erb", :layout => "layouts/yield")
+
+ body.each do |piece|
+ content << piece
+ end
+
+ assert_equal "<title>", content[0]
+ assert_equal "", content[1]
+ assert_equal "</title>\n", content[2]
+ assert_equal "Hello world!", content[3]
+ assert_equal "\n", content[4]
+ end
+
+ def test_render_file
+ assert_equal "Hello world!", buffered_render(:file => "test/hello_world.erb")
+ end
+
+ def test_render_file_with_locals
+ locals = { :secret => 'in the sauce' }
+ assert_equal "The secret is in the sauce\n", buffered_render(:file => "test/render_file_with_locals.erb", :locals => locals)
+ end
+
+ def test_render_partial
+ assert_equal "only partial", buffered_render(:partial => "test/partial_only")
+ end
+
+ def test_render_inline
+ assert_equal "Hello, World!", buffered_render(:inline => "Hello, World!")
+ end
+
+ def test_render_without_layout
assert_equal "Hello world!", buffered_render(:template => "test/hello_world")
end
- def test_render_template_with_layout
+ def test_render_with_layout
assert_equal %(<title></title>\nHello world!\n),
buffered_render(:template => "test/hello_world.erb", :layout => "layouts/yield")
end
+
+ def test_render_with_layout_which_has_render_inline
+ assert_equal %(welcome\nHello world!\n),
+ buffered_render(:template => "test/hello_world.erb", :layout => "layouts/yield_with_render_inline_inside")
+ end
+
+ def test_render_with_layout_which_renders_another_partial
+ assert_equal %(partial html\nHello world!\n),
+ buffered_render(:template => "test/hello_world.erb", :layout => "layouts/yield_with_render_partial_inside")
+ end
+
+ def test_render_with_nested_layout
+ assert_equal %(<title>title</title>\n\n<div id="column">column</div>\n<div id="content">content</div>\n),
+ buffered_render(:template => "test/nested_layout.erb", :layout => "layouts/yield")
+ end
+
+ def test_render_with_file_in_layout
+ assert_equal %(\n<title>title</title>\n\n),
+ buffered_render(:template => "test/layout_render_file.erb")
+ end
+
+ def test_render_with_handler_without_streaming_support
+ assert_match "<p>This is grand!</p>", buffered_render(:template => "test/hello")
+ end
end if defined?(Fiber)
Please sign in to comment.
Something went wrong with that request. Please try again.