Use registerDestructor instead of willDestroy (#22)

lozjackson · May 11, 2024 · 359de11 · 359de11
1 parent cc2694d
commit 359de11
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/addon/services/clock.js b/addon/services/clock.js
@@ -4,6 +4,7 @@
 import Service from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 import { cancel, later } from '@ember/runloop';
+import { registerDestructor } from '@ember/destroyable';
 
 /**
  * ## ClockService
@@ -58,6 +59,7 @@ export default class ClockService extends Service {
   constructor() {
     super(...arguments);
     this.start();
+    registerDestructor(this, () => this.stop());
   }
 
   /**
@@ -103,13 +105,4 @@ export default class ClockService extends Service {
     }
     this.nextTick = later(this, this.tick, 1000);
   }
-
-  /**
-    call `stop()`
-    @event willDestroy
-    @private
-  */
-  willDestroy() {
-    this.stop();
-  }
 }
diff --git a/tests/unit/services/clock-test.js b/tests/unit/services/clock-test.js
@@ -39,10 +39,4 @@ module('Unit | Service | clock', function (hooks) {
 
     assert.true(setTimeStub.calledOnce, 'setTime was called once');
   });
-
-  test('willDestroy', function (assert) {
-    const clock = this.owner.lookup('service:clock');
-    clock.willDestroy();
-    assert.strictEqual(clock.nextTick, null);
-  });
 });