remove use of defer

zestia · Nov 12, 2024 · 2e076cb · 2e076cb
1 parent 8726a6e
commit 2e076cb
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/addon/components/tooltip.gjs b/addon/components/tooltip.gjs
@@ -1,6 +1,5 @@
 import { action } from '@ember/object';
 import { cancel, later, next } from '@ember/runloop';
-import { defer } from 'rsvp';
 import { getPosition, getCoords } from '@zestia/position-utils';
 import { guidFor } from '@ember/object/internals';
 import { htmlSafe } from '@ember/template';
@@ -264,7 +263,7 @@ export default class TooltipComponent extends Component {
   }
 
   _renderTooltip() {
-    this.willInsertTooltip = defer();
+    this.willInsertTooltip = Promise.withResolvers();
     this.shouldRenderTooltip = true;
 
     return this.willInsertTooltip.promise;

diff --git a/tests/integration/components/tooltip/loading-attr-test.gjs b/tests/integration/components/tooltip/loading-attr-test.gjs
@@ -2,15 +2,14 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'dummy/tests/helpers';
 import { render, triggerEvent, settled } from '@ember/test-helpers';
 import Tooltip from '@zestia/ember-async-tooltips/components/tooltip';
-import { defer } from 'rsvp';
 
 module('tooltip | loading attributes', function (hooks) {
   setupRenderingTest(hooks);
 
   test('tooltip informs tooltipper it is loading', async function (assert) {
     assert.expect(3);
 
-    const deferred = defer();
+    const deferred = Promise.withResolvers();
 
     const load = () => deferred.promise;
 

diff --git a/tests/integration/components/tooltip/loading-data-test.gjs b/tests/integration/components/tooltip/loading-data-test.gjs
@@ -1,7 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'dummy/tests/helpers';
 import { render, waitUntil, settled, triggerEvent } from '@ember/test-helpers';
-import { defer } from 'rsvp';
 import {
   wait,
   hasText,
@@ -15,7 +14,7 @@ module('tooltip | loading data', function (hooks) {
   test('loading data', async function (assert) {
     assert.expect(6);
 
-    const deferred = defer();
+    const deferred = Promise.withResolvers();
 
     const load = () => {
       assert.step('load tooltip');

diff --git a/tests/integration/components/tooltip/loading-error-test.gjs b/tests/integration/components/tooltip/loading-error-test.gjs
@@ -1,7 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'dummy/tests/helpers';
 import { render, settled, triggerEvent } from '@ember/test-helpers';
-import { defer } from 'rsvp';
 import { tracked } from '@glimmer/tracking';
 import Tooltip from '@zestia/ember-async-tooltips/components/tooltip';
 
@@ -11,8 +10,8 @@ module('tooltip | loading error', function (hooks) {
   test('loading error', async function (assert) {
     assert.expect(3);
 
-    const deferred1 = defer();
-    const deferred2 = defer();
+    const deferred1 = Promise.withResolvers();
+    const deferred2 = Promise.withResolvers();
 
     const state = new (class {
       @tracked load = () => deferred1.promise;

diff --git a/tests/integration/components/tooltip/rendering-test.gjs b/tests/integration/components/tooltip/rendering-test.gjs
@@ -1,7 +1,6 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'dummy/tests/helpers';
 import { settled, render, triggerEvent } from '@ember/test-helpers';
-import { defer } from 'rsvp';
 import { tracked } from '@glimmer/tracking';
 import Tooltip from '@zestia/ember-async-tooltips/components/tooltip';
 
@@ -116,7 +115,7 @@ module('tooltip | rendering', function (hooks) {
       @tracked show = true;
     })();
 
-    const deferred = defer();
+    const deferred = Promise.withResolvers();
 
     const load = () => deferred.promise;