Fix mentions not working properly

CHANGELOG.md

@@ -23,5 +23,6 @@ controller or added a new module you need to rename `feature` to `component`.
 - **decidim-accountability**: Fix parent results progress [\#2954](https://github.com/decidim/decidim/pull/2954)
 - **decidim-core**: Fix `Decidim::UserPresenter#nickname` [\#2958](https://github.com/decidim/decidim/pull/2958)
 - **decidim-verifications**: Only show authorizations from current organization [\#2959](https://github.com/decidim/decidim/pull/2959)
+- **decidim-comments**: Fix mentions not working properly.  [\#2947](https://github.com/decidim/decidim/pull/2947)
 
 Please check [0.10-stable](https://github.com/decidim/decidim/blob/0.10-stable/CHANGELOG.md) for previous changes.

decidim-comments/app/types/decidim/comments/commentable_mutation_type.rb

@@ -17,7 +17,7 @@ module Comments
 
         resolve lambda { |obj, args, ctx|
           params = { "comment" => { "body" => args[:body], "alignment" => args[:alignment], "user_group_id" => args[:userGroupId] } }
-          form = Decidim::Comments::CommentForm.from_params(params)
+          form = Decidim::Comments::CommentForm.from_params(params).with_context(current_organization: ctx[:current_organization])
           Decidim::Comments::CreateComment.call(form, ctx[:current_user], obj) do
             on(:ok) do |comment|
               return comment

decidim-comments/spec/types/commentable_mutation_type_spec.rb

@@ -21,7 +21,10 @@ module Comments
 
         it "calls CreateComment command" do
           params = { "comment" => { "body" => body, "alignment" => alignment, "user_group_id" => nil } }
+          context = { current_organization: current_organization }
           expect(Decidim::Comments::CommentForm).to receive(:from_params).with(params).and_call_original
+          expect_any_instance_of(Decidim::Comments::CommentForm) # rubocop:disable RSpec/AnyInstance
+            .to receive(:with_context).with(context).and_call_original
           expect(Decidim::Comments::CreateComment).to receive(:call).with(
             an_instance_of(Decidim::Comments::CommentForm),
             current_user,

decidim-core/lib/decidim/core/test/shared_examples/comments_examples.rb

@@ -174,5 +174,45 @@
         end
       end
     end
+
+    describe "mentions" do
+      before do
+        visit resource_path
+
+        within ".add-comment form" do
+          fill_in "add-comment-#{commentable.commentable_type}-#{commentable.id}", with: content
+          click_button "Send"
+        end
+      end
+
+      context "when mentioning a valid user" do
+        let!(:mentioned_user) { create(:user, :confirmed, organization: organization) }
+        let(:content) { "A valid user mention: @#{mentioned_user.nickname}" }
+
+        it "replaces the mention with a link to the user's profile" do
+          expect(page).to have_comment_from(user, "A valid user mention: @#{mentioned_user.nickname}")
+          expect(page).to have_link "@#{mentioned_user.nickname}", href: "/profiles/#{mentioned_user.nickname}"
+        end
+      end
+
+      context "when mentioning an existing user outside current organization" do
+        let!(:mentioned_user) { create(:user, :confirmed, organization: create(:organization)) }
+        let(:content) { "This text mentions a user outside current organization: @#{mentioned_user.nickname}" }
+
+        it "ignores the mention" do
+          expect(page).to have_comment_from(user, "This text mentions a user outside current organization: @#{mentioned_user.nickname}")
+          expect(page).not_to have_link "@#{mentioned_user.nickname}"
+        end
+      end
+
+      context "when mentioning a non valid user" do
+        let(:content) { "This text mentions a @nonexistent user" }
+
+        it "ignores the mention" do
+          expect(page).to have_comment_from(user, "This text mentions a @nonexistent user")
+          expect(page).not_to have_link "@nonexistent"
+        end
+      end
+    end
   end
 end