DEV: Use the new hasHtml/includesHtml from qunit-dom (#29680)

plugins/chat/test/javascripts/components/chat-message-collapser-test.js

@@ -53,11 +53,9 @@ module("Discourse Chat | Component | chat message collapser", function (hooks) {
     this.set("uploads", [{ original_filename: evilString }]);
     await render(hbs`<ChatMessageCollapser @uploads={{this.uploads}} />`);
 
-    assert.true(
-      query(".chat-message-collapser-link-small").innerHTML.includes(
-        evilStringEscaped
-      )
-    );
+    assert
+      .dom(".chat-message-collapser-link-small")
+      .includesHtml(evilStringEscaped);
   });
 });
 
@@ -399,16 +397,14 @@ module(
       );
       await render(hbs`<ChatMessageCollapser @cooked={{this.cooked}} />`);
 
-      assert.true(
-        queryAll(".chat-message-collapser-link-small")[0].innerHTML.includes(
-          evilStringEscaped
-        )
-      );
-      assert.true(
-        queryAll(".chat-message-collapser-link-small")[1].innerHTML.includes(
-          "&lt;script&gt;someeviltitle&lt;/script&gt;"
-        )
-      );
+      const links = [
+        ...document.querySelectorAll(".chat-message-collapser-link-small"),
+      ];
+
+      assert.dom(links[0]).includesHtml(evilStringEscaped);
+      assert
+        .dom(links[1])
+        .includesHtml("&lt;script&gt;someeviltitle&lt;/script&gt;");
     });
 
     test("shows alt or links (if no alt) for linked image", async function (assert) {
@@ -511,10 +507,7 @@ module(
       assert
         .dom(".chat-message-collapser-link-small")
         .hasProperty("href", /%3Cscript%3Esomeeviltitle%3C\/script%3E$/);
-      assert.strictEqual(
-        query(".chat-message-collapser-link-small").innerHTML.trim(),
-        "someeviltitle"
-      );
+      assert.dom(".chat-message-collapser-link-small").hasHtml("someeviltitle");
     });
 
     test("removes album title overlay", async function (assert) {

plugins/chat/test/javascripts/components/chat-message-test.js

@@ -4,7 +4,6 @@ import hbs from "htmlbars-inline-precompile";
 import { module, test } from "qunit";
 import CoreFabricators from "discourse/lib/fabricators";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { query } from "discourse/tests/helpers/qunit-helpers";
 import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Component | chat-message", function (hooks) {
@@ -64,11 +63,9 @@ module("Discourse Chat | Component | chat-message", function (hooks) {
     await this.message.cook();
     await render(template);
 
-    assert.true(
-      query(".chat-message-text")
-        .innerHTML.trim()
-        .includes("<p>what <mark>test</mark></p>")
-    );
+    assert
+      .dom(".chat-message-text")
+      .includesHtml("<p>what <mark>test</mark></p>");
   });
 
   test("Message with reply", async function (assert) {

plugins/chat/test/javascripts/components/chat-modal-archive-channel-test.js

@@ -3,7 +3,6 @@ import { render } from "@ember/test-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { query } from "discourse/tests/helpers/qunit-helpers";
 import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module(
@@ -20,11 +19,9 @@ module(
         hbs`<Chat::Modal::ArchiveChannel @inline={{true}} @model={{hash channel=this.channel}} />`
       );
 
-      assert.true(
-        query(".chat-modal-archive-channel").innerHTML.includes(
-          "&lt;script&gt;someeviltitle&lt;/script&gt;"
-        )
-      );
+      assert
+        .dom(".chat-modal-archive-channel")
+        .includesHtml("&lt;script&gt;someeviltitle&lt;/script&gt;");
     });
   }
 );

plugins/chat/test/javascripts/components/chat-modal-delete-channel-test.js

@@ -3,7 +3,6 @@ import { render } from "@ember/test-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { query } from "discourse/tests/helpers/qunit-helpers";
 import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module(
@@ -20,11 +19,9 @@ module(
         hbs`<Chat::Modal::DeleteChannel @inline={{true}} @model={{hash channel=this.channel}} />`
       );
 
-      assert.true(
-        query(".chat-modal-delete-channel__instructions").innerHTML.includes(
-          "&lt;script&gt;someeviltitle&lt;/script&gt;"
-        )
-      );
+      assert
+        .dom(".chat-modal-delete-channel__instructions")
+        .includesHtml("&lt;script&gt;someeviltitle&lt;/script&gt;");
     });
   }
 );

plugins/chat/test/javascripts/components/chat-modal-move-message-to-channel-test.js

@@ -3,7 +3,6 @@ import { render } from "@ember/test-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { query } from "discourse/tests/helpers/qunit-helpers";
 import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module(
@@ -24,11 +23,9 @@ module(
         />
       `);
 
-      assert.true(
-        query(".chat-modal-move-message-to-channel").innerHTML.includes(
-          "<script>someeviltitle</script>"
-        )
-      );
+      assert
+        .dom(".chat-modal-move-message-to-channel")
+        .includesHtml("<script>someeviltitle</script>");
     });
   }
 );

plugins/chat/test/javascripts/components/chat-thread-header-test.js

@@ -3,7 +3,6 @@ import { render } from "@ember/test-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { query } from "discourse/tests/helpers/qunit-helpers";
 import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Component | chat-thread-header", function (hooks) {
@@ -17,10 +16,8 @@ module("Discourse Chat | Component | chat-thread-header", function (hooks) {
       <Chat::Thread::Header @thread={{this.thread}} @channel={{this.thread.channel}} />
     `);
 
-    assert.ok(
-      query(".c-navbar__title")
-        .innerHTML.trim()
-        .includes("&lt;style&gt;body { background: red;}&lt;/style&gt;")
-    );
+    assert
+      .dom(".c-navbar__title")
+      .includesHtml("&lt;style&gt;body { background: red;}&lt;/style&gt;");
   });
 });

plugins/chat/test/javascripts/components/chat-thread-list-item-test.js

@@ -3,7 +3,6 @@ import { render } from "@ember/test-helpers";
 import hbs from "htmlbars-inline-precompile";
 import { module, test } from "qunit";
 import { setupRenderingTest } from "discourse/tests/helpers/component-test";
-import { query } from "discourse/tests/helpers/qunit-helpers";
 import ChatFabricators from "discourse/plugins/chat/discourse/lib/fabricators";
 
 module("Discourse Chat | Component | chat-thread-list-item", function (hooks) {
@@ -17,9 +16,8 @@ module("Discourse Chat | Component | chat-thread-list-item", function (hooks) {
       <Chat::ThreadList::Item @thread={{this.thread}} />
     `);
 
-    assert.equal(
-      query(".chat-thread-list-item__title").innerHTML.trim(),
-      "&lt;style&gt;body { background: red;}&lt;/style&gt;"
-    );
+    assert
+      .dom(".chat-thread-list-item__title")
+      .hasHtml("&lt;style&gt;body { background: red;}&lt;/style&gt;");
   });
 });