From 0a58564dddb5286fa16fa0fb9fa1b96ba073839e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 20 Nov 2023 13:27:44 +0000
Subject: [PATCH] DEV: Make DTooltipInstance destroy synchronous (#24439)

Having async cleanup on a modifier is problematic because it means it might persist beyond the end of a test, leading to flaky 'Test is not isolated' errors.
---
 .../float-kit/addon/lib/d-tooltip-instance.js          |  4 ++--
 .../float-kit/addon/lib/float-kit-instance.js          | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js b/app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js
index 18fe268fe47..bedad0fd7bf 100644
--- a/app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js
+++ b/app/assets/javascripts/float-kit/addon/lib/d-tooltip-instance.js
@@ -56,8 +56,8 @@ export default class DTooltipInstance extends FloatKitInstance {
   }
 
   @action
-  async destroy() {
-    await this.close();
+  destroy() {
+    this.close();
     this.tearDownListeners();
   }
 }
diff --git a/app/assets/javascripts/float-kit/addon/lib/float-kit-instance.js b/app/assets/javascripts/float-kit/addon/lib/float-kit-instance.js
index e15bdaef3ae..4a4c0132e38 100644
--- a/app/assets/javascripts/float-kit/addon/lib/float-kit-instance.js
+++ b/app/assets/javascripts/float-kit/addon/lib/float-kit-instance.js
@@ -1,6 +1,6 @@
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { cancel, next } from "@ember/runloop";
+import { cancel } from "@ember/runloop";
 import { makeArray } from "discourse-common/lib/helpers";
 import discourseLater from "discourse-common/lib/later";
 import { bind } from "discourse-common/utils/decorators";
@@ -20,17 +20,13 @@ export default class FloatKitInstance {
   content = null;
 
   @action
-  async show() {
+  show() {
     this.expanded = true;
-
-    await new Promise((resolve) => next(resolve));
   }
 
   @action
-  async close() {
+  close() {
     this.expanded = false;
-
-    await new Promise((resolve) => next(resolve));
   }
 
   @action