From 07fde1a3d36d0622d5fa9c040bfca70db675926a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 18 Apr 2011 14:25:51 +0200 Subject: Just define the controller if fibers are defined. --- actionpack/test/controller/new_base/render_streaming_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb index 27ba4b1a29..dbd6c66d1f 100644 --- a/actionpack/test/controller/new_base/render_streaming_test.rb +++ b/actionpack/test/controller/new_base/render_streaming_test.rb @@ -58,5 +58,5 @@ module RenderStreaming assert_equal "chunked", headers["Transfer-Encoding"] assert_equal cache, headers["Cache-Control"] end - end if defined?(Fiber) -end + end +end if defined?(Fiber) -- cgit v1.2.3 From 3b0f917b1dfabce6a6b338e4a7cb02995c055596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Mon, 18 Apr 2011 14:27:30 +0200 Subject: Test explicit skip. --- actionpack/test/controller/new_base/render_streaming_test.rb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'actionpack/test') diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb index dbd6c66d1f..ffc4b331ec 100644 --- a/actionpack/test/controller/new_base/render_streaming_test.rb +++ b/actionpack/test/controller/new_base/render_streaming_test.rb @@ -8,11 +8,15 @@ module RenderStreaming )] layout "application" - stream :only => :hello_world + stream :only => [:hello_world, :skip] def hello_world end + def skip + render :action => "hello_world", :stream => false + end + def explicit render :action => "hello_world", :stream => true end @@ -52,6 +56,11 @@ module RenderStreaming assert_streaming! end + test "skip rendering with streaming at render level" do + get "/render_streaming/basic/skip" + assert_body "Hello world, I'm here!" + end + def assert_streaming!(cache="no-cache") assert_status 200 assert_equal nil, headers["Content-Length"] -- cgit v1.2.3