Merge pull request #47483 from palkan/fix/channel-test-case-test-server

Fix using TestServer in ConnectionStub
rails · Mar 3, 2023 · 1bc9db4 · 1bc9db4
2 parents 5aa84bc + 8fff6d6
commit 1bc9db4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/actioncable/lib/action_cable/channel/base.rb b/actioncable/lib/action_cable/channel/base.rb
@@ -286,7 +286,7 @@ def action_signature(action, data)
         end
 
         def parameter_filter
-          @parameter_filter ||= ActiveSupport::ParameterFilter.new(connection.server.config.filter_parameters)
+          @parameter_filter ||= ActiveSupport::ParameterFilter.new(connection.config.filter_parameters)
         end
 
         def transmit_subscription_confirmation

diff --git a/actioncable/lib/action_cable/channel/test_case.rb b/actioncable/lib/action_cable/channel/test_case.rb
@@ -45,7 +45,7 @@ def start_periodic_timers; end
     end
 
     class ConnectionStub
-      attr_reader :transmissions, :identifiers, :subscriptions, :logger, :server
+      attr_reader :transmissions, :identifiers, :subscriptions, :logger, :config
 
       def initialize(identifiers = {})
         @transmissions = []
@@ -57,7 +57,7 @@ def initialize(identifiers = {})
         @subscriptions = ActionCable::Connection::Subscriptions.new(self)
         @identifiers = identifiers.keys
         @logger = ActiveSupport::TaggedLogging.new ActiveSupport::Logger.new(StringIO.new)
-        @server = TestServer.new
+        @config = ActionCable::Server::Configuration.new
       end
 
       def transmit(cable_message)

diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb
@@ -51,7 +51,7 @@ class Base
       include ActiveSupport::Rescuable
 
       attr_reader :server, :env, :subscriptions, :logger, :worker_pool, :protocol
-      delegate :event_loop, :pubsub, to: :server
+      delegate :event_loop, :pubsub, :config, to: :server
 
       def initialize(server, env, coder: ActiveSupport::JSON)
         @server, @env, @coder = server, env, coder

diff --git a/actioncable/test/stubs/test_connection.rb b/actioncable/test/stubs/test_connection.rb
@@ -5,7 +5,7 @@
 class TestConnection
   attr_reader :identifiers, :logger, :current_user, :server, :subscriptions, :transmissions
 
-  delegate :pubsub, to: :server
+  delegate :pubsub, :config, to: :server
 
   def initialize(user = User.new("lifo"), coder: ActiveSupport::JSON, subscription_adapter: SuccessAdapter)
     @coder = coder