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 | |
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')
-rw-r--r-- | actioncable/test/connection/authorization_test.rb | 1 | ||||
-rw-r--r-- | actioncable/test/connection/base_test.rb | 1 | ||||
-rw-r--r-- | actioncable/test/connection/cross_site_forgery_test.rb | 1 | ||||
-rw-r--r-- | actioncable/test/connection/string_identifier_test.rb | 1 | ||||
-rw-r--r-- | actioncable/test/connection/subscriptions_test.rb | 1 | ||||
-rw-r--r-- | actioncable/test/test_helper.rb | 5 | ||||
-rw-r--r-- | actioncable/test/worker_test.rb | 2 |
7 files changed, 0 insertions, 12 deletions
diff --git a/actioncable/test/connection/authorization_test.rb b/actioncable/test/connection/authorization_test.rb index 68668b2835..87d0e79ef3 100644 --- a/actioncable/test/connection/authorization_test.rb +++ b/actioncable/test/connection/authorization_test.rb @@ -10,7 +10,6 @@ class ActionCable::Connection::AuthorizationTest < ActionCable::TestCase end def send_async(method, *args) - # Bypass Celluloid send method, *args end end diff --git a/actioncable/test/connection/base_test.rb b/actioncable/test/connection/base_test.rb index da6041db4a..182562db82 100644 --- a/actioncable/test/connection/base_test.rb +++ b/actioncable/test/connection/base_test.rb @@ -14,7 +14,6 @@ class ActionCable::Connection::BaseTest < ActionCable::TestCase end def send_async(method, *args) - # Bypass Celluloid send method, *args end end diff --git a/actioncable/test/connection/cross_site_forgery_test.rb b/actioncable/test/connection/cross_site_forgery_test.rb index d445e08f2a..a29f65fb97 100644 --- a/actioncable/test/connection/cross_site_forgery_test.rb +++ b/actioncable/test/connection/cross_site_forgery_test.rb @@ -6,7 +6,6 @@ class ActionCable::Connection::CrossSiteForgeryTest < ActionCable::TestCase class Connection < ActionCable::Connection::Base def send_async(method, *args) - # Bypass Celluloid send method, *args end end diff --git a/actioncable/test/connection/string_identifier_test.rb b/actioncable/test/connection/string_identifier_test.rb index ab69df57b3..9d0bda83ef 100644 --- a/actioncable/test/connection/string_identifier_test.rb +++ b/actioncable/test/connection/string_identifier_test.rb @@ -10,7 +10,6 @@ class ActionCable::Connection::StringIdentifierTest < ActionCable::TestCase end def send_async(method, *args) - # Bypass Celluloid send method, *args end end diff --git a/actioncable/test/connection/subscriptions_test.rb b/actioncable/test/connection/subscriptions_test.rb index 4f6760827e..62e41484fe 100644 --- a/actioncable/test/connection/subscriptions_test.rb +++ b/actioncable/test/connection/subscriptions_test.rb @@ -5,7 +5,6 @@ class ActionCable::Connection::SubscriptionsTest < ActionCable::TestCase attr_reader :websocket def send_async(method, *args) - # Bypass Celluloid send method, *args end end 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 diff --git a/actioncable/test/worker_test.rb b/actioncable/test/worker_test.rb index 69c4b6529d..9911a3b98b 100644 --- a/actioncable/test/worker_test.rb +++ b/actioncable/test/worker_test.rb @@ -17,8 +17,6 @@ class WorkerTest < ActiveSupport::TestCase end setup do - Celluloid.boot - @worker = ActionCable::Server::Worker.new @receiver = Receiver.new end |