Skip to content

A platform for community discussion. Free, open, simple.

DEV: Fixup the calendar test helper (#39487)

Jarek Radosz81ec46fe6a13
diff --git a/plugins/discourse-calendar/test/javascripts/acceptance/topic-calendar-events-test.js b/plugins/discourse-calendar/test/javascripts/acceptance/topic-calendar-events-test.js
index 2be3ed2d27a..824369853fb 100644
--- a/plugins/discourse-calendar/test/javascripts/acceptance/topic-calendar-events-test.js
+++ b/plugins/discourse-calendar/test/javascripts/acceptance/topic-calendar-events-test.js
@@ -1,4 +1,4 @@
-import { visit } from "@ember/test-helpers";
+import { visit, waitFor } from "@ember/test-helpers";
import { test } from "qunit";
import { cloneJSON } from "discourse/lib/object";
import pretender, { response } from "discourse/tests/helpers/create-pretender";
@@ -30,7 +30,9 @@ acceptance("Topic Calendar Events", function (needs) {
test("renders calendar events with fullDay='true'", async function (assert) {
pretender.get("/t/252.json", () => fixtureWithFullDay("true"));
await visit("/t/-/252");
+ await waitFor(".fc-daygrid-event-harness");
+ assert.dom(".fc-daygrid-day").exists("the calendar rendered");
assert.dom(getEventByText("Event 1")).exists();
assert.dom(getEventByText("Event 2")).exists();
});
@@ -38,7 +40,9 @@ acceptance("Topic Calendar Events", function (needs) {
test("renders calendar events with fullDay='false'", async function (assert) {
pretender.get("/t/252.json", () => fixtureWithFullDay("false"));
await visit("/t/-/252");
+ await waitFor(".fc-daygrid-event-harness");
+ assert.dom(".fc-daygrid-day").exists("the calendar rendered");
assert.dom(getEventByText("Event 1")).exists();
assert.dom(getEventByText("Event 2")).exists();
});
diff --git a/plugins/discourse-calendar/test/javascripts/helpers/get-event-by-text.js b/plugins/discourse-calendar/test/javascripts/helpers/get-event-by-text.js
index c41736dd030..0fea5d26701 100644
--- a/plugins/discourse-calendar/test/javascripts/helpers/get-event-by-text.js
+++ b/plugins/discourse-calendar/test/javascripts/helpers/get-event-by-text.js
@@ -1,6 +1,9 @@
export default function getEventByText(text) {
- const events = [...document.querySelectorAll(".fc-day-grid-event")].filter(
- (event) => event.textContent.includes(text)
+ const events = [
+ ...document.querySelectorAll(".fc-daygrid-event-harness"),
+ ].filter(
+ (event) =>
+ event.querySelector(".fc-event-title")?.textContent.trim() === text
);
switch (events.length) {