fix: ensure timers are cleaned up on service destroy (#303)

adopted-ember-addons · Nov 19, 2019 · f2229f4 · f2229f4
1 parent 5ad7d8d
commit f2229f4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/addon/services/flash-messages.js b/addon/services/flash-messages.js
@@ -40,6 +40,11 @@ export default Service.extend({
     this.queue = emberArray();
   },
 
+  willDestroy() {
+    this._super(...arguments);
+    this.clearMessages();
+  },
+
   add(options = {}) {
     this._enqueue(this._newFlashMessage(options));
 
@@ -53,6 +58,7 @@ export default Service.extend({
       return;
     }
 
+    flashes.forEach(flash => flash.destroyMessage());
     flashes.clear();
 
     return this;

diff --git a/tests/unit/services/flash-messages-test.js b/tests/unit/services/flash-messages-test.js
@@ -95,7 +95,7 @@ module('FlashMessagesService', function(hooks) {
     service.success('foo');
     service.success('bar');
     service.success('baz');
-    service.clearMessages();
+    run(() => service.clearMessages());
 
     assert.equal(typeOf(get(service, 'queue')), 'array', 'it returns an array');
     assert.equal(get(service, 'queue.length'), 0, 'it clears the array');