aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-09-23 15:59:32 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-09-23 15:59:32 -0700
commitb5e36dd00a6feedb79cf84b921a04ce80172b6f4 (patch)
treeab90cd53bb8e400b3aa793eda44d5c050b8807ec /actionpack
parentd175ab2bd628dd97f85776d5066a095308dde6cb (diff)
downloadrails-b5e36dd00a6feedb79cf84b921a04ce80172b6f4.tar.gz
rails-b5e36dd00a6feedb79cf84b921a04ce80172b6f4.tar.bz2
rails-b5e36dd00a6feedb79cf84b921a04ce80172b6f4.zip
don't touch the response object until after we call `get`
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/live_stream_test.rb7
1 files changed, 2 insertions, 5 deletions
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index e9c19b7acf..94888cb125 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -281,10 +281,9 @@ module ActionController
@controller.latch = Concurrent::CountDownLatch.new
parts = ['hello', 'world']
- @controller.request = @request
- @controller.response = @response
+ get :blocking_stream
- t = Thread.new(@response) { |resp|
+ t = Thread.new(response) { |resp|
resp.await_commit
resp.stream.each do |part|
assert_equal parts.shift, part
@@ -294,8 +293,6 @@ module ActionController
end
}
- @controller.process :blocking_stream
-
assert t.join(3), 'timeout expired before the thread terminated'
end