diff --git a/app/controllers/cards/comments/reactions_controller.rb b/app/controllers/cards/comments/reactions_controller.rb index 2d9a55603..a23d4c068 100644 --- a/app/controllers/cards/comments/reactions_controller.rb +++ b/app/controllers/cards/comments/reactions_controller.rb @@ -34,11 +34,11 @@ class Cards::Comments::ReactionsController < ApplicationController end def broadcast_create(reaction) - reaction.broadcast_append_to @comment, :reactions, + reaction.broadcast_append_to @card, target: "reactions_comment_#{@comment.id}", partial: "cards/comments/reactions/reaction", locals: { comment: @comment } end def broadcast_remove(reaction) - reaction.broadcast_remove_to @comment, :reactions + reaction.broadcast_remove_to @card end end diff --git a/app/views/cards/comments/reactions/_reactions.html.erb b/app/views/cards/comments/reactions/_reactions.html.erb index 8e9198b73..06db43d01 100644 --- a/app/views/cards/comments/reactions/_reactions.html.erb +++ b/app/views/cards/comments/reactions/_reactions.html.erb @@ -1,6 +1,4 @@ <%= turbo_frame_tag comment, :reacting do %> - <%= turbo_stream_from comment, :reactions %> -
<%= render partial: "cards/comments/reactions/reaction", collection: comment.reactions.ordered, locals: { comment: comment }, cached: true %> diff --git a/app/views/cards/show.html.erb b/app/views/cards/show.html.erb index 93f338f8a..638b88b2a 100644 --- a/app/views/cards/show.html.erb +++ b/app/views/cards/show.html.erb @@ -1,4 +1,5 @@ <% @page_title = card_title(@card) %> +<%= turbo_stream_from @card %> <% content_for :header do %> <% if @card.creating? && @card.can_recover_abandoned_creation? %> diff --git a/test/controllers/cards/comments/reactions_controller_test.rb b/test/controllers/cards/comments/reactions_controller_test.rb index 01fc8a3e3..51b17daae 100644 --- a/test/controllers/cards/comments/reactions_controller_test.rb +++ b/test/controllers/cards/comments/reactions_controller_test.rb @@ -4,10 +4,11 @@ class Cards::Comments::ReactionsControllerTest < ActionDispatch::IntegrationTest setup do sign_in_as :jz @comment = comments(:logo_agreement_jz) + @card = @comment.card end test "create" do - assert_turbo_stream_broadcasts [ @comment, :reactions ], count: 1 do + assert_turbo_stream_broadcasts @card, count: 1 do assert_difference -> { @comment.reactions.count }, 1 do post card_comment_reactions_url(@comment.card, @comment, format: :turbo_stream), params: { reaction: { content: "Great work!" } } assert_redirected_to card_comment_reactions_url(@comment.card, @comment) @@ -16,7 +17,7 @@ class Cards::Comments::ReactionsControllerTest < ActionDispatch::IntegrationTest end test "destroy" do - assert_turbo_stream_broadcasts [ @comment, :reactions ], count: 1 do + assert_turbo_stream_broadcasts @card, count: 1 do assert_difference -> { @comment.reactions.count }, -1 do delete card_comment_reaction_url(@comment.card, @comment, reactions(:kevin), format: :turbo_stream) assert_response :success