From c1916f798452fa2ff494c08f3b25e1e6f6fa6285 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Fri, 8 Nov 2024 20:27:32 +0100 Subject: [PATCH] DEV: Convert `assert.true(exists())` to qunit-dom (#29638) --- .../acceptance/composer-messages-test.js | 8 +++--- .../sidebar-user-categories-section-test.js | 7 ++--- .../components/widgets/render-glimmer-test.js | 25 ++++++++--------- .../components/channel-icon-test.gjs | 4 +-- .../components/channel-name-test.gjs | 2 +- .../components/chat-channel-card-test.js | 12 ++++---- .../chat-channel-preview-card-test.js | 28 ++++++++----------- .../components/chat-composer-dropdown-test.js | 9 +++--- .../components/chat-composer-upload-test.js | 11 ++++---- .../components/chat-emoji-avatar-test.js | 9 +++--- .../components/chat-message-avatar-test.js | 3 +- .../components/chat-message-info-test.js | 14 +++++----- .../components/chat-message-reaction-test.js | 4 +-- .../components/chat-message-test.js | 25 ++++++++--------- .../components/chat-message-text-test.js | 8 +++--- .../components/chat-upload-test.js | 10 +++---- .../javascripts/components/collapser-test.js | 4 +-- .../components/dc-filter-input-test.js | 12 ++++---- .../user-menu/chat-notifications-list-test.js | 4 +-- .../acceptance/poll-builder-enabled-test.js | 22 ++++++--------- 20 files changed, 101 insertions(+), 120 deletions(-) diff --git a/app/assets/javascripts/discourse/tests/acceptance/composer-messages-test.js b/app/assets/javascripts/discourse/tests/acceptance/composer-messages-test.js index fa1a0655356..982ec95b683 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/composer-messages-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/composer-messages-test.js @@ -47,7 +47,7 @@ acceptance("Composer - Messages", function (needs) { await triggerKeyEvent(".d-editor-input", "keyup", "Space"); - assert.true(exists(".composer-popup"), "shows composer warning message"); + assert.dom(".composer-popup").exists("shows composer warning message"); assert.true( query(".composer-popup").innerHTML.includes( @@ -101,7 +101,7 @@ acceptance("Composer - Messages - Cannot see group", function (needs) { ); await fillIn(".d-editor-input", "Mention @staff"); - assert.true(exists(".composer-popup"), "shows composer warning message"); + assert.dom(".composer-popup").exists("shows composer warning message"); assert.true( query(".composer-popup").innerHTML.includes( I18n.t("composer.cannot_see_group_mention.not_allowed", { @@ -121,7 +121,7 @@ acceptance("Composer - Messages - Cannot see group", function (needs) { ); await fillIn(".d-editor-input", "Mention @staff2"); - assert.true(exists(".composer-popup"), "shows composer warning message"); + assert.dom(".composer-popup").exists("shows composer warning message"); assert.true( query(".composer-popup").innerHTML.includes( I18n.t("composer.cannot_see_group_mention.some_not_allowed", { @@ -242,7 +242,7 @@ acceptance("Composer - Messages - Private Messages", function (needs) { await triggerKeyEvent(".d-editor-input", "keyup", "Space"); - assert.true(exists(".composer-popup"), "shows composer warning message"); + assert.dom(".composer-popup").exists("shows composer warning message"); assert.true( query(".composer-popup").innerHTML.includes( I18n.t("composer.yourself_confirm.title") diff --git a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js index d2388ff54e1..58e357d6b98 100644 --- a/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js +++ b/app/assets/javascripts/discourse/tests/acceptance/sidebar-user-categories-section-test.js @@ -141,10 +141,9 @@ acceptance("Sidebar - Logged on user - Categories Section", function (needs) { ".sidebar-section[data-section-name='categories'] .sidebar-section-header-button" ); - assert.true( - exists(".sidebar-categories-form"), - "it shows the categories form modal" - ); + assert + .dom(".sidebar-categories-form") + .exists("shows the categories form modal"); }); test("categories section is shown with site's top categories when user has not added any categories and there are no default categories set for the user", async function (assert) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/render-glimmer-test.js b/app/assets/javascripts/discourse/tests/integration/components/widgets/render-glimmer-test.js index da2c77aa8ea..d8f56926ff7 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/render-glimmer-test.js +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/render-glimmer-test.js @@ -4,7 +4,6 @@ import { click, fillIn, render } from "@ember/test-helpers"; import { hbs } from "ember-cli-htmlbars"; import { module, test } from "qunit"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; -import { exists } from "discourse/tests/helpers/qunit-helpers"; import widgetHbs from "discourse/widgets/hbs-compiler"; import RenderGlimmer, { registerWidgetShim, @@ -169,8 +168,8 @@ module("Integration | Component | Widget | render-glimmer", function (hooks) { ` ); - assert.true(exists("div.my-widget"), "widget is rendered"); - assert.true(exists("div.glimmer-content"), "glimmer content is rendered"); + assert.dom("div.my-widget").exists("widget is rendered"); + assert.dom("div.glimmer-content").exists("glimmer content is rendered"); assert .dom("div.glimmer-content") .hasText("arg1=val1 dynamicArg=", "arguments are passed through"); @@ -200,9 +199,9 @@ module("Integration | Component | Widget | render-glimmer", function (hooks) { {{/unless}}` ); - assert.true(exists("div.my-widget"), "widget is rendered"); - assert.true(exists("div.glimmer-content"), "glimmer content is rendered"); - assert.true(exists("div.demo-component"), "demo component is rendered"); + assert.dom("div.my-widget").exists("widget is rendered"); + assert.dom("div.glimmer-content").exists("glimmer content is rendered"); + assert.dom("div.demo-component").exists("demo component is rendered"); assert.deepEqual( DemoComponent.eventLog, @@ -261,10 +260,9 @@ module("Integration | Component | Widget | render-glimmer", function (hooks) { {{/unless}}` ); - assert.true( - exists("div.demo-component button"), - "component button is rendered" - ); + assert + .dom("div.demo-component button") + .exists("component button is rendered"); await click("div.demo-component button"); assert.true(DemoWidget.actionTriggered, "widget event is triggered"); @@ -284,10 +282,9 @@ module("Integration | Component | Widget | render-glimmer", function (hooks) { .dom(".action-state") .hasText("false", "eventTriggered is false in nested component"); - assert.true( - exists("div.demo-component button"), - "component button is rendered" - ); + assert + .dom("div.demo-component button") + .exists("component button is rendered"); await click("div.demo-component button"); assert.true(DemoWidget.actionTriggered, "widget event is triggered"); diff --git a/plugins/chat/test/javascripts/components/channel-icon-test.gjs b/plugins/chat/test/javascripts/components/channel-icon-test.gjs index ed4dd2f398f..8a5fce60e75 100644 --- a/plugins/chat/test/javascripts/components/channel-icon-test.gjs +++ b/plugins/chat/test/javascripts/components/channel-icon-test.gjs @@ -42,7 +42,7 @@ module("Discourse Chat | Component | ", function (hooks) { await render(); - assert.true(exists(".d-icon-lock")); + assert.dom(".d-icon-lock").exists(); }); test("category channel - not read restricted", async function (assert) { @@ -67,7 +67,7 @@ module("Discourse Chat | Component | ", function (hooks) { await render(); - assert.true(exists(`.chat-user-avatar .avatar[title="${user.username}"]`)); + assert.dom(`.chat-user-avatar .avatar[title="${user.username}"]`).exists(); }); test("dm channel - multiple users", async function (assert) { diff --git a/plugins/chat/test/javascripts/components/channel-name-test.gjs b/plugins/chat/test/javascripts/components/channel-name-test.gjs index 4150da52069..ff0678d5f2f 100644 --- a/plugins/chat/test/javascripts/components/channel-name-test.gjs +++ b/plugins/chat/test/javascripts/components/channel-name-test.gjs @@ -114,7 +114,7 @@ module("Discourse Chat | Component | ", function (hooks) { ); - assert.true(exists(".chat-channel-unread-indicator")); + assert.dom(".chat-channel-unread-indicator").exists(); unreadIndicator = false; await render(