Fix a race in ActionCable stream tests

These tests double-stub connection.pubsub, so we need to ensure the first call's completed before we set up for the second.
rails · Mar 22, 2017 · 62a8e83 · 62a8e83
1 parent 911f44f
commit 62a8e83
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/actioncable/test/channel/stream_test.rb b/actioncable/test/channel/stream_test.rb
@@ -55,6 +55,8 @@ class StreamTest < ActionCable::TestCase
         channel = ChatChannel.new connection, "{id: 1}", id: 1
         channel.subscribe_to_channel
 
+        wait_for_async
+
         connection.expects(:pubsub).returns mock().tap { |m| m.expects(:unsubscribe) }
         channel.unsubscribe_from_channel
       end
@@ -67,6 +69,8 @@ class StreamTest < ActionCable::TestCase
         channel = SymbolChannel.new connection, ""
         channel.subscribe_to_channel
 
+        wait_for_async
+
         connection.expects(:pubsub).returns mock().tap { |m| m.expects(:unsubscribe) }
         channel.unsubscribe_from_channel
       end