diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-28 11:57:15 -0800 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-28 11:57:15 -0800 |
commit | 9af4258186027e5a80bd5a0c821862378e1492ad (patch) | |
tree | e1796cfd815be569e3c0ad27d046211c148b05fc /actionpack | |
parent | a92c707895c5ec7552abd957537605f8bc3d5703 (diff) | |
download | rails-9af4258186027e5a80bd5a0c821862378e1492ad.tar.gz rails-9af4258186027e5a80bd5a0c821862378e1492ad.tar.bz2 rails-9af4258186027e5a80bd5a0c821862378e1492ad.zip |
set the error callback to a nice default in case nobody set an error callback and an error happens
Diffstat (limited to 'actionpack')
-rw-r--r-- | actionpack/lib/action_controller/metal/live.rb | 2 | ||||
-rw-r--r-- | actionpack/test/controller/live_stream_test.rb | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb index fdf4ef293d..5ef4f6ccda 100644 --- a/actionpack/lib/action_controller/metal/live.rb +++ b/actionpack/lib/action_controller/metal/live.rb @@ -108,7 +108,7 @@ module ActionController class Buffer < ActionDispatch::Response::Buffer #:nodoc: def initialize(response) - @error_callback = nil + @error_callback = lambda { true } super(response, SizedQueue.new(10)) end diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb index fb6a750089..934915fc5b 100644 --- a/actionpack/test/controller/live_stream_test.rb +++ b/actionpack/test/controller/live_stream_test.rb @@ -313,4 +313,11 @@ module ActionController assert_equal 304, @response.status.to_i end end + + class BufferTest < ActionController::TestCase + def test_nil_callback + buf = ActionController::Live::Buffer.new nil + assert buf.call_on_error + end + end end |