diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-08 18:23:41 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-08 18:23:41 +0100 |
| commit | 3b7ccadfc1c8dfec61af898167e1300b17f5cf25 (patch) | |
| tree | af16b019ee7d19b3a1db3a371842bdcb659774f2 /actioncable/test/test_helper.rb | |
| parent | 76c385709c873a7105e3a267d84c4e70417a15e2 (diff) | |
| parent | cd1d7e287b09a6461d8eb5febd877602de6aca6c (diff) | |
| download | rails-3b7ccadfc1c8dfec61af898167e1300b17f5cf25.tar.gz rails-3b7ccadfc1c8dfec61af898167e1300b17f5cf25.tar.bz2 rails-3b7ccadfc1c8dfec61af898167e1300b17f5cf25.zip | |
Merge pull request #22934 from mperham/master
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, 0 insertions, 5 deletions
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb index 12dcd98402..325305939f 100644 --- a/actioncable/test/test_helper.rb +++ b/actioncable/test/test_helper.rb @@ -14,11 +14,6 @@ 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 |