Merge pull request #34003 from palkan/fix/cable-test-case-rails5-hack

Remove Rails 5.0 workaround from ActionCable::Channel::TestCase

1 files changed, 2 insertions, 6 deletions

diff --git a/actioncable/lib/action_cable/channel/test_case.rb b/actioncable/lib/action_cable/channel/test_case.rb
index 88d7c7092b..a26051d687 100644
--- a/actioncable/lib/action_cable/channel/test_case.rb
+++ b/actioncable/lib/action_cable/channel/test_case.rb
@@ -215,13 +215,9 @@ module ActionCable
         # Subsribe to the channel under test. Optionally pass subscription parameters as a Hash.
         def subscribe(params = {})
           @connection ||= stub_connection
-          # NOTE: Rails < 5.0.1 calls subscribe_to_channel during #initialize.
-          #       We have to stub before it
-          @subscription = self.class.channel_class.allocate
+          @subscription = self.class.channel_class.new(connection, CHANNEL_IDENTIFIER, params.with_indifferent_access)
           @subscription.singleton_class.include(ChannelStub)
-          @subscription.send(:initialize, connection, CHANNEL_IDENTIFIER, params.with_indifferent_access)
-          # Call subscribe_to_channel if it's public (Rails 5.0.1+)
-          @subscription.subscribe_to_channel if ActionCable.gem_version >= Gem::Version.new("5.0.1")
+          @subscription.subscribe_to_channel
           @subscription
         end