diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-08 20:09:25 +0100 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-08 20:09:25 +0100 |
commit | 36fe3015644284dfbd7716c1d844dd8ad68b88c2 (patch) | |
tree | d111571f1a34efba019097993b074123c943e93e /actioncable/test/test_helper.rb | |
parent | 3b7ccadfc1c8dfec61af898167e1300b17f5cf25 (diff) | |
download | rails-36fe3015644284dfbd7716c1d844dd8ad68b88c2.tar.gz rails-36fe3015644284dfbd7716c1d844dd8ad68b88c2.tar.bz2 rails-36fe3015644284dfbd7716c1d844dd8ad68b88c2.zip |
Revert "Move async execution from celluloid to concurrent-ruby"
Diffstat (limited to 'actioncable/test/test_helper.rb')
-rw-r--r-- | actioncable/test/test_helper.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb index 325305939f..12dcd98402 100644 --- a/actioncable/test/test_helper.rb +++ b/actioncable/test/test_helper.rb @@ -14,6 +14,11 @@ require 'rack/mock' # Require all the stubs and models Dir[File.dirname(__FILE__) + '/stubs/*.rb'].each {|file| require file } +$CELLULOID_DEBUG = false +$CELLULOID_TEST = false +require 'celluloid' +Celluloid.logger = Logger.new(StringIO.new) + require 'faye/websocket' class << Faye::WebSocket remove_method :ensure_reactor_running |