Default connection class to ActionCable::Connection::Base.

Instead of depending on ApplicationCable::Connection being defined at initialize
we should inject it in the Railtie.

Thus we can kill more setup in the tests too.

2 files changed, 6 insertions, 2 deletions

diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb
index acca3961d8..f5f1cb59e0 100644
--- a/actioncable/lib/action_cable/engine.rb
+++ b/actioncable/lib/action_cable/engine.rb
@@ -31,6 +31,10 @@ module ActionCable
           self.cable = Rails.application.config_for(config_path).with_indifferent_access
         end
 
+        if 'ApplicationCable::Connection'.safe_constantize
+          self.connection_class = ApplicationCable::Connection
+        end
+
         self.channel_paths = Rails.application.paths['app/channels'].existent
 
         options.each { |k,v| send("#{k}=", v) }
diff --git a/actioncable/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb
index 019a374734..58bb8ff65a 100644
--- a/actioncable/lib/action_cable/server/configuration.rb
+++ b/actioncable/lib/action_cable/server/configuration.rb
@@ -13,8 +13,8 @@ module ActionCable
       def initialize
         @log_tags = []
 
-        @connection_class  = ApplicationCable::Connection
-        @worker_pool_size  = 100
+        @connection_class = ActionCable::Connection::Base
+        @worker_pool_size = 100
 
         @disable_request_forgery_protection = false
       end