stash

addon/-legacy-private/system/model/model.js

@@ -1,6 +1,7 @@
 import ComputedProperty from '@ember/object/computed';
 import { isNone } from '@ember/utils';
 import EmberError from '@ember/error';
+import run from '@ember/runloop';
 import Evented from '@ember/object/evented';
 import EmberObject, { computed, get } from '@ember/object';
 import Map from '../map';
@@ -615,7 +616,10 @@ const Model = EmberObject.extend(Evented, {
   destroyRecord(options) {
     this.deleteRecord();
     return this.save(options).then(() => {
-      this.unloadRecord();
+      // the nested runloop here is necessary to ensure that the record is fully
+      //   destroyed prior to the promise resolving.
+      //   run.join is inadequate as the destroy queue would still be flushed after the resolve
+      run(() => this.unloadRecord());
     });
   },
 

tests/integration/records/delete-record-test.js

@@ -304,6 +304,7 @@ module('integration/deletedRecord - Deleting Records', function(hooks) {
     await record.destroyRecord();
 
     assert.equal(get(record, 'currentState.stateName'), 'root.deleted.saved', 'We reached the correct persisted saved state');
+    debugger;
     assert.equal(
       get(store.peekAll('person'), 'length'),
       0,