fix test warnings (#492)

- fix ember-data complex default value returning in post model - fix mirage returning a user of id 'me' from /user/me
TryGhost · Jan 13, 2017 · b01b8a6 · b01b8a6
1 parent f110a97
commit b01b8a6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/app/adapters/user.js b/app/adapters/user.js
@@ -19,5 +19,15 @@ export default ApplicationAdapter.extend(SlugUrl, {
 
     findAll(store, type, id) {
         return this.query(store, type, {id, status: 'all'});
+    },
+
+    queryRecord(store, type, query) {
+        if (!query || query.id !== 'me') {
+            return this._super(...arguments);
+        }
+
+        let url = this.buildURL(type.modelName, 'me', null, 'findRecord');
+
+        return this.ajax(url, 'GET', {data: {include: 'roles'}});
     }
 });
diff --git a/app/models/post.js b/app/models/post.js
@@ -72,7 +72,7 @@ export default Model.extend(Comparable, ValidationEngine, {
     title: attr('string', {defaultValue: ''}),
     slug: attr('string'),
     markdown: attr('string', {defaultValue: ''}),
-    mobiledoc: attr('json-string', {defaultValue: BLANK_DOC}),
+    mobiledoc: attr('json-string', {defaultValue: () => BLANK_DOC}),
     html: attr('string'),
     image: attr('string'),
     featured: attr('boolean', {defaultValue: false}),

diff --git a/app/services/session.js b/app/services/session.js
@@ -7,7 +7,7 @@ export default SessionService.extend({
     feature: injectService(),
 
     user: computed(function () {
-        return this.get('store').findRecord('user', 'me');
+        return this.get('store').queryRecord('user', {id: 'me'});
     }),
 
     authenticate() {