From 4c10b2eb339b09cd36257e37ea6fc57ba9357a28 Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Wed, 22 May 2024 17:49:04 +0200 Subject: [PATCH] DEV: Fix home-logo test flakes (#27135) --- .../tests/integration/components/home-logo-test.gjs | 6 ++++-- .../tests/integration/components/widgets/home-logo-test.gjs | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs index 1a2f77a0f93..eda96645f20 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/home-logo-test.gjs @@ -2,11 +2,12 @@ import { getOwner } from "@ember/application"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; import HomeLogo, { - clearHomeLogoHrefCallback, + clearHomeLogoHrefCallback as clearComponentHomeLogoHrefCallback, } from "discourse/components/header/home-logo"; import { withPluginApi } from "discourse/lib/plugin-api"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { query } from "discourse/tests/helpers/qunit-helpers"; +import { clearHomeLogoHrefCallback as clearWidgetHomeLogoHrefCallback } from "discourse/widgets/home-logo"; const bigLogo = "/images/d-logo-sketch.png?test"; const smallLogo = "/images/d-logo-sketch-small.png?test"; @@ -22,7 +23,8 @@ module("Integration | Component | home-logo", function (hooks) { this.session = getOwner(this).lookup("service:session"); this.session.set("darkModeAvailable", null); this.session.set("defaultColorSchemeIsDark", null); - clearHomeLogoHrefCallback(); + clearWidgetHomeLogoHrefCallback(); + clearComponentHomeLogoHrefCallback(); }); test("basics", async function (assert) { diff --git a/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.gjs b/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.gjs index dd49b693e67..b0488fe76c8 100644 --- a/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.gjs +++ b/app/assets/javascripts/discourse/tests/integration/components/widgets/home-logo-test.gjs @@ -2,11 +2,12 @@ import { getOwner } from "@ember/application"; import { render } from "@ember/test-helpers"; import { module, test } from "qunit"; +import { clearHomeLogoHrefCallback as clearComponentHomeLogoHrefCallback } from "discourse/components/header/home-logo"; import MountWidget from "discourse/components/mount-widget"; import { withPluginApi } from "discourse/lib/plugin-api"; import { setupRenderingTest } from "discourse/tests/helpers/component-test"; import { count, exists, query } from "discourse/tests/helpers/qunit-helpers"; -import { clearHomeLogoHrefCallback } from "discourse/widgets/home-logo"; +import { clearHomeLogoHrefCallback as clearWidgetHomeLogoHrefCallback } from "discourse/widgets/home-logo"; const bigLogo = "/images/d-logo-sketch.png?test"; const smallLogo = "/images/d-logo-sketch-small.png?test"; @@ -22,7 +23,8 @@ module("Integration | Component | Widget | home-logo", function (hooks) { this.session = getOwner(this).lookup("service:session"); this.session.set("darkModeAvailable", null); this.session.set("defaultColorSchemeIsDark", null); - clearHomeLogoHrefCallback(); + clearWidgetHomeLogoHrefCallback(); + clearComponentHomeLogoHrefCallback(); }); test("basics", async function (assert) {