diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-24 16:00:15 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2016-01-24 16:00:15 +0100 |
| commit | 53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc (patch) | |
| tree | 631e1157afb6bfe4e0e5c4ffdc4a69ef6a713f1b /actioncable/test/subscription_adapter | |
| parent | 3bebb65e86baac1792499c94679a4d4a0cc4acbd (diff) | |
| parent | 503fe757c7f5f917deab95acdcd421a1dede05c7 (diff) | |
| download | rails-53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc.tar.gz rails-53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc.tar.bz2 rails-53a9da4cf2d99c73bb2b71c84098c9fe32d3cedc.zip | |
Merge pull request #23152 from matthewd/actioncable-concurrent
Eliminate the EventMachine dependency
Diffstat (limited to 'actioncable/test/subscription_adapter')
| -rw-r--r-- | actioncable/test/subscription_adapter/common.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/actioncable/test/subscription_adapter/common.rb b/actioncable/test/subscription_adapter/common.rb index d4a13be889..361858784e 100644 --- a/actioncable/test/subscription_adapter/common.rb +++ b/actioncable/test/subscription_adapter/common.rb @@ -1,7 +1,6 @@ require 'test_helper' require 'concurrent' -require 'action_cable/process/logging' require 'active_support/core_ext/hash/indifferent_access' require 'pathname' @@ -24,8 +23,6 @@ module CommonSubscriptionAdapterTest # and now the "real" setup for our test: - spawn_eventmachine - server.config.cable = cable_config.with_indifferent_access adapter_klass = server.config.pubsub_adapter |