From b0f92d9e823a9065b2c24af70cb351b8ab445fcd Mon Sep 17 00:00:00 2001
From: Kelvin Tan <kelv@discourse.org>
Date: Wed, 22 Nov 2023 23:08:40 +0800
Subject: [PATCH] DEV: update tests for user-notes-modal

---
 .../discourse/components/show-user-notes.hbs  |  2 +-
 .../javascripts/acceptance/user-notes-test.js | 21 +++++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/assets/javascripts/discourse/components/show-user-notes.hbs b/assets/javascripts/discourse/components/show-user-notes.hbs
index 9d24167..e105e15 100644
--- a/assets/javascripts/discourse/components/show-user-notes.hbs
+++ b/assets/javascripts/discourse/components/show-user-notes.hbs
@@ -1,5 +1,5 @@
 <DButton
-  @class="btn btn-default"
+  @class="btn btn-default show-user-notes-btn"
   @action={{@show}}
   @icon="pencil-alt"
   @translatedLabel={{this.label}}
diff --git a/test/javascripts/acceptance/user-notes-test.js b/test/javascripts/acceptance/user-notes-test.js
index a1a0539..a6c11cd 100644
--- a/test/javascripts/acceptance/user-notes-test.js
+++ b/test/javascripts/acceptance/user-notes-test.js
@@ -41,22 +41,25 @@ acceptance("User Notes", function (needs) {
   test("creates note from user's profile", async function (assert) {
     await visit("/admin/users/1/eviltrout");
 
-    assert.dom(".user-controls button").hasText(I18n.t("user_notes.title"));
-    assert.dom(".user-notes-modal.modal-body").isNotVisible();
+    const modalClass = ".user-notes-modal .d-modal__container";
+    assert
+      .dom(".user-controls .show-user-notes-btn")
+      .hasText(I18n.t("user_notes.title"));
+    assert.dom(modalClass).isNotVisible();
 
-    await click(".user-controls button");
+    await click(".user-controls .show-user-notes-btn");
 
-    assert.dom(".user-notes-modal.modal-body").isVisible();
+    assert.dom(modalClass).isVisible();
 
-    await fillIn(".user-notes-modal textarea", "Helpful user");
+    await fillIn(`${modalClass} textarea`, "Helpful user");
 
-    assert.dom(".user-notes-modal.modal-body button").isEnabled();
+    assert.dom(`${modalClass} .btn-primary`).isEnabled();
 
-    await click(".user-notes-modal.modal-body button");
-    await click(".user-notes-modal button.modal-close");
+    await click(`${modalClass} .btn-primary`);
+    await click(`${modalClass} .modal-close`);
 
     assert
-      .dom(".user-controls button")
+      .dom(".user-controls .show-user-notes-btn")
       .hasText(I18n.t("user_notes.show", { count: 1 }));
   });
 });