diff options
author | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-04-19 00:14:50 +0200 |
---|---|---|
committer | Josh Kalderimis <josh.kalderimis@gmail.com> | 2011-04-19 00:14:50 +0200 |
commit | e5919536a6d8372937b9bc34940f3daf4108290d (patch) | |
tree | 73bea5fe7b29a7932a272bbad3294844134dd05b /actionpack/test | |
parent | 1d8be7bc6f098b829ac14ef457af688043975ddc (diff) | |
parent | 64e2a549cf92f25026a85575940a722492310125 (diff) | |
download | rails-e5919536a6d8372937b9bc34940f3daf4108290d.tar.gz rails-e5919536a6d8372937b9bc34940f3daf4108290d.tar.bz2 rails-e5919536a6d8372937b9bc34940f3daf4108290d.zip |
Merge branch 'master' of https://github.com/rails/rails into multi_json
Diffstat (limited to 'actionpack/test')
-rw-r--r-- | actionpack/test/controller/new_base/render_streaming_test.rb | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb index 27ba4b1a29..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,11 +56,16 @@ 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"] assert_equal "chunked", headers["Transfer-Encoding"] assert_equal cache, headers["Cache-Control"] end - end if defined?(Fiber) -end + end +end if defined?(Fiber) |