1 files changed, 8 insertions, 5 deletions
diff --git a/actioncable/test/connection/identifier_test.rb b/actioncable/test/connection/identifier_test.rb
index 204197c2a7..a7e23b4cd8 100644
--- a/actioncable/test/connection/identifier_test.rb
+++ b/actioncable/test/connection/identifier_test.rb
@@ -30,13 +30,16 @@ class ActionCable::Connection::IdentifierTest < ActionCable::TestCase
     run_in_eventmachine do
       server = TestServer.new
 
-      server.pubsub.expects(:subscribe)
-        .with("action_cable/User#lifo", kind_of(Proc))
-      server.pubsub.expects(:unsubscribe)
-        .with("action_cable/User#lifo", kind_of(Proc))
-
       open_connection(server)
       close_connection
+      wait_for_async
+
+      %w[subscribe unsubscribe].each do |method|
+        pubsub_call = server.pubsub.class.class_variable_get "@@#{method}_called"
+
+        assert_equal "action_cable/User#lifo", pubsub_call[:channel]
+        assert_instance_of Proc, pubsub_call[:callback]
+      end
     end
   end