Merge pull request #915 from simplabs/fix-cookie-store-regression

Don't start syncing cookie before first restore
mainmatter · Feb 29, 2016 · 823aa9d · 823aa9d
2 parents 4c0a795 + df20ac5
commit 823aa9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/addon/session-stores/cookie.js b/addon/session-stores/cookie.js
@@ -2,7 +2,7 @@ import Ember from 'ember';
 import BaseStore from './base';
 import objectsAreEqual from '../utils/objects-are-equal';
 
-const { RSVP, computed, on } = Ember;
+const { RSVP, computed, on, run: { next } } = Ember;
 
 /**
   Session store that persists data in a cookie.
@@ -88,8 +88,10 @@ export default BaseStore.extend({
   }).volatile(),
 
   _setup: on('init', function() {
-    this._syncData().then(() => {
-      this._renewExpiration();
+    next(() => {
+      this._syncData().then(() => {
+        this._renewExpiration();
+      });
     });
   }),
 

diff --git a/tests/unit/session-stores/shared/cookie-store-behavior.js b/tests/unit/session-stores/shared/cookie-store-behavior.js
@@ -79,8 +79,10 @@ export default function(options) {
       sync(store);
 
       Ember.run.next(() => {
-        expect(triggered).to.be.true;
-        done();
+        Ember.run.next(() => {
+          expect(triggered).to.be.true;
+          done();
+        });
       });
     });