From 015b4e2c0c8e1b831caae922f51772130fdd1431 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Wed, 8 Nov 2023 19:58:28 +0100
Subject: [PATCH] spec

---
 .../components/chat/message-creator/list.gjs    |  1 +
 .../chat/components/message_creator.rb          | 17 +++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list.gjs b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list.gjs
index f560a5acc01..d068b9251c4 100644
--- a/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list.gjs
+++ b/plugins/chat/assets/javascripts/discourse/components/chat/message-creator/list.gjs
@@ -99,6 +99,7 @@ export default class List extends Component {
             {{on "mouseleave" (fn @onHighlight null)}}
             role="button"
             tabindex="0"
+            data-identifier={{item.identifier}}
           >
             {{component (this.componentForItem item.type) item=item}}
           </li>
diff --git a/plugins/chat/spec/system/page_objects/chat/components/message_creator.rb b/plugins/chat/spec/system/page_objects/chat/components/message_creator.rb
index d6e8c692eb9..f874da4cccb 100644
--- a/plugins/chat/spec/system/page_objects/chat/components/message_creator.rb
+++ b/plugins/chat/spec/system/page_objects/chat/components/message_creator.rb
@@ -13,7 +13,7 @@ module PageObjects
         end
 
         def input
-          component.find(".chat-message-creator__input")
+          component.find(".chat-message-creator__search-input__input")
         end
 
         def filter(query = "")
@@ -104,7 +104,7 @@ module PageObjects
         end
 
         def build_row_selector(chatable, **args)
-          selector = ".chat-message-creator__row"
+          selector = ".chat-message-creator__list-item"
           selector += content_selector(**args)
           selector += chatable_selector(chatable, **args)
           selector
@@ -116,9 +116,9 @@ module PageObjects
           selector = ".-selected" if args[:selected]
           selector = ":not(.-disabled)" if args[:enabled]
           if args[:active]
-            selector += ".-active"
+            selector += ".-highlighted"
           elsif args[:inactive]
-            selector += ":not(.-active)"
+            selector += ":not(.-highlighted)"
           end
           selector
         end
@@ -126,14 +126,11 @@ module PageObjects
         def chatable_selector(chatable, **args)
           selector = ""
           if chatable.try(:category_channel?)
-            selector += ".-channel"
-            selector += "[data-id='c-#{chatable.id}']"
+            selector += "[data-identifier='c-#{chatable.id}']"
           elsif chatable.try(:direct_message_channel?)
-            selector += ".-channel"
-            selector += "[data-id='c-#{chatable.id}']"
+            selector += "[data-identifier='c-#{chatable.id}']"
           else
-            selector += ".-user"
-            selector += "[data-id='u-#{chatable.id}']"
+            selector += "[data-identifier='u-#{chatable.id}']"
           end
           selector
         end