ensure there is an active run loop

emberjs · Dec 21, 2016 · bf25fe6 · bf25fe6
1 parent 7efa6a1
commit bf25fe6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/addon/-private/system/store.js b/addon/-private/system/store.js
@@ -2654,7 +2654,9 @@ Store = Service.extend({
       return;
     }
 
-    this._backburner.schedule('syncRelationships', this, this._flushUpdatedRelationships);
+    this._backburner.join(() => {
+      this._backburner.schedule('syncRelationships', this, this._flushUpdatedRelationships);
+    });
   },
 
   _flushUpdatedRelationships() {

diff --git a/tests/dummy/app/routes/query/route.js b/tests/dummy/app/routes/query/route.js
@@ -24,6 +24,10 @@ export default Route.extend({
     let modelName = params.modelName;
     delete params.modelName;
 
+    // Once heimdall 0.4.x is released we can uncomment this
+    // to have nice timeline and trace events integration
+    // heimdall.enableTimelineFeatures();
+
     let token = heimdall.start('ember-data');
     return this.get('store').query(modelName, params)
       .then((records) => {