Only return messages produced by block in capture_turbo_stream_broadcasts

Author: Vivalldi

lib/turbo/broadcastable/test_helper.rb

@@ -155,10 +155,12 @@ def assert_no_turbo_stream_broadcasts(stream_name_or_object, &block)
       #     assert_equal "replace", remove["action"]
       #
       def capture_turbo_stream_broadcasts(stream_name_or_object, &block)
-        block&.call
-
         stream_name = stream_name_from(stream_name_or_object)
-        payloads = broadcasts(stream_name)
+        payloads = if block_given?
+          new_broadcasts_from(broadcasts(stream_name), stream_name, "capture_turbo_stream_broadcasts", &block)
+        else
+          broadcasts(stream_name)
+        end
 
         payloads.flat_map do |payload|
           html = ActiveSupport::JSON.decode(payload)

test/broadcastable/test_helper_test.rb

@@ -193,6 +193,22 @@ class Turbo::Broadcastable::TestHelper::AssertTurboStreamBroadcastsTest < Active
       end
     end
   end
+
+  test "#capture_turbo_stream_broadcasts only returns new <turbo-stream> elements when block given" do
+    message = Message.new(id: 1)
+
+    message.broadcast_update_to "messages"
+    message.broadcast_refresh_to "messages"
+
+    replace, remove, *rest = capture_turbo_stream_broadcasts "messages" do
+      message.broadcast_replace_to "messages"
+      message.broadcast_remove_to "messages"
+    end
+
+    assert_empty rest
+    assert_equal "replace", replace["action"]
+    assert_equal "remove", remove["action"]
+  end
 end
 
 class Turbo::Broadcastable::TestHelper::AssertNoTurboStreamBroadcastsTest < ActiveSupport::TestCase