store#unloadRecord to destroy record. add test to show record is

destroyed and observers removed

addon/-private/system/store.js

@@ -376,6 +376,7 @@ Store = Service.extend({
   */
   unloadRecord(record) {
     record.unloadRecord();
+    record.destroy();
   },
 
   // ................
@@ -1360,8 +1361,7 @@ Store = Service.extend({
 
       for (let i = 0; i < records.length; i++) {
         record = records[i];
-        record.unloadRecord();
-        record.destroy(); // maybe within unloadRecord
+        this.unloadRecord(record);
       }
 
       typeMap.metadata = new EmptyObject();

tests/unit/store/unload-test.js

@@ -97,6 +97,39 @@ test("unload a record", function(assert) {
   });
 });
 
+test("unload a record - observers should be removed", function(assert) {
+  assert.expect(3);
+
+  run(function() {
+    store.push({
+      data: {
+        type: 'record',
+        id: '1',
+        attributes: {
+          title: 'toto'
+        }
+      }
+    });
+
+    store.findRecord('record', 1).then(function(record) {
+      Ember.addObserver(record, 'title', record, function() {
+        assert.ok(false, 'observer for record.title');
+      });
+
+      run(function() {
+        store.unloadRecord(record);
+      });
+
+      run(function() {
+        let observers = Ember.observersFor(record, 'title');
+        assert.equal(get(record, 'isDeleted'), true, 'record is deleted');
+        assert.equal(get(record, 'isDestroyed'), true, 'record is destroyed');
+        assert.equal(observers.length, 0, 'record should not have observers');
+      });
+    });
+  });
+});
+
 module("DS.Store - unload record with relationships");