1 files changed, 35 insertions, 3 deletions
diff --git a/actioncable/test/subscription_adapter/evented_redis_test.rb b/actioncable/test/subscription_adapter/evented_redis_test.rb
index f316bc46ef..e3e0a0c72a 100644
--- a/actioncable/test/subscription_adapter/evented_redis_test.rb
+++ b/actioncable/test/subscription_adapter/evented_redis_test.rb
@@ -1,11 +1,17 @@
+# frozen_string_literal: true
+
 require "test_helper"
-require_relative "./common"
+require_relative "common"
+require_relative "channel_prefix"
 
 class EventedRedisAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest
+  include ChannelPrefixTest
 
   def setup
-    super
+    assert_deprecated do
+      super
+    end
 
     # em-hiredis is warning-rich
     @previous_verbose, $VERBOSE = $VERBOSE, nil
@@ -23,7 +29,33 @@ class EventedRedisAdapterTest < ActionCable::TestCase
     $VERBOSE = @previous_verbose
   end
 
+  def test_slow_eventmachine
+    require "eventmachine"
+    require "thread"
+
+    lock = Mutex.new
+
+    EventMachine.singleton_class.class_eval do
+      alias_method :delayed_initialize_event_machine, :initialize_event_machine
+      define_method(:initialize_event_machine) do
+        lock.synchronize do
+          sleep 0.5
+          delayed_initialize_event_machine
+        end
+      end
+    end
+
+    test_basic_broadcast
+  ensure
+    lock.synchronize do
+      EventMachine.singleton_class.class_eval do
+        alias_method :initialize_event_machine, :delayed_initialize_event_machine
+        remove_method :delayed_initialize_event_machine
+      end
+    end
+  end
+
   def cable_config
-    { adapter: "evented_redis", url: "redis://127.0.0.1:6379/12" }
+    { adapter: "evented_redis", url: "redis://:password@127.0.0.1:6379/12" }
   end
 end