Improve test setup

addon/adapters/application.js

@@ -42,21 +42,30 @@ export default Ember.Object.extend(FetchMixin, Evented, {
  Find resource(s) using an id or a using a query `{id: '', query: {}}`
 
  @method find
- @param {Object|String} options use a string for a single id or an object
+ @param {Object|String|Number} options use a string for a single id or an object.
  @return {Promise}
  */
  find(options) {
- if (typeof options === 'string') {
- return this.findOne(options);
- } else if (typeof options === 'object') {
- if (options.id) {
- return this.findOne(options.id, options.query);
+ // Collect id and query from options (if given).
+ // Ensure id is String conform JSONAPI specs.
+ // findOne when id is given, otherwise findQuery.
+ let id, query;
+
+ if (options !== undefined) {
+ if (typeof options === 'object') {
+ query = options; // default
+
+ if (options.hasOwnProperty('id')) {
+ id = options.id.toString();
+ query = options.query;
+ }
  } else {
-return this.findQuery(options);
+id = options.toString();
  }
- } else {
- return this.findQuery();
  }
+
+ // this works even for id 0 since it is cast to string.
+ return id ? this.findOne(id, query) : this.findQuery(query);
  },
 
  /**
@@ -312,7 +321,7 @@ export default Ember.Object.extend(FetchMixin, Evented, {
  */
  _payloadForRelationship(resource, relationship, id) {
  let data = resource.get(['relationships', relationship, 'data'].join('.'));
- let resourceObject = { type: pluralize(relationship), id: id };
+ let resourceObject = { type: pluralize(relationship), id: id.toString() };
  return { data: (Array.isArray(data)) ? [resourceObject] : resourceObject };
  },
 

addon/models/resource.js

@@ -116,7 +116,7 @@ const Resource = Ember.Object.extend(ResourceOperationsMixin, {
  @method toString
  */
  toString() {
- let type = this.get('type') || 'null';
+ let type = singularize(this.get('type')) || 'null';
  let id = this.get('id') || 'null';
  return `[JSONAPIResource|${type}:${id}]`;
  },
@@ -189,6 +189,7 @@ const Resource = Ember.Object.extend(ResourceOperationsMixin, {
  @param {String} id
  */
  addRelationship(related, id) {
+ if (id !== undefined) { id = id.toString(); } // ensure String id.
  let key = ['relationships', related, 'data'].join('.');
  let data = this.get(key);
  let type = pluralize(related);
@@ -229,6 +230,8 @@ const Resource = Ember.Object.extend(ResourceOperationsMixin, {
  @param {String} id
  */
  removeRelationship(related, id) {
+ if (id !== undefined) { id = id.toString(); } // ensure String ids.
+
  let relation = this.get('relationships.' + related);
  if (Array.isArray(relation.data)) {
  for (let i = 0; i < relation.data.length; i++) {
@@ -415,8 +418,14 @@ Resource.reopenClass({
  for (let i = 0; i < attrs.length; i++) {
  prototype[attrs[i]] = {};
  }
+
  const instance = this._super(prototype);
  if (properties) {
+ if (properties.hasOwnProperty('id')) {
+ // JSONAPI ids MUST be strings.
+ properties.id = properties.id.toString();
+ }
+
  instance.setProperties(properties);
  }
  let type = singularize(instance.get('type'));

tests/dummy/app/models/author.js

@@ -3,7 +3,7 @@ import Resource from './resource';
 import { attr, hasMany } from 'ember-jsonapi-resources/models/resource';
 
 export default Resource.extend({
- type: 'author',
+ type: 'authors',
  service: Ember.inject.service('authors'),
 
  name: attr('string'),

tests/dummy/app/models/comment.js

@@ -3,7 +3,7 @@ import Resource from './resource';
 import { attr, hasOne } from 'ember-jsonapi-resources/models/resource';
 
 export default Resource.extend({
- type: 'comment',
+ type: 'comments',
  service: Ember.inject.service('comments'),
 
  body: attr('string'),

tests/dummy/app/models/commenter.js

@@ -3,7 +3,7 @@ import Resource from './resource';
 import { attr, hasMany } from 'ember-jsonapi-resources/models/resource';
 
 export default Resource.extend({
- type: 'commenter',
+ type: 'commenters',
  service: Ember.inject.service('commenters'),
 
  name: attr('string'),

tests/dummy/app/models/employee.js

@@ -1,12 +1,8 @@
-import Ember from 'ember';
-import Resource from './resource';
-import { attr, hasMany } from 'ember-jsonapi-resources/models/resource';
+import PersonResource from './person';
+import { hasOne, hasMany } from 'ember-jsonapi-resources/models/resource';
 
-export default Resource.extend({
+export default PersonResource.extend({
  type: 'employees',
- service: Ember.inject.service('employees'),
-
- name: attr('string'),
-
- pictures: hasMany('pictures')
+ pictures: hasMany('pictures'),
+ supervisor: hasOne({resource: 'supervisor', type: 'employees'})
 });

tests/dummy/app/models/person.js

@@ -0,0 +1,9 @@
+import Ember from 'ember';
+import Resource from './resource';
+import { attr } from 'ember-jsonapi-resources/models/resource';
+
+export default Resource.extend({
+ type: 'people',
+ service: Ember.inject.service('people'),
+ name: attr() // can use any value type for an attribute
+});

tests/dummy/app/models/post.js

@@ -3,7 +3,7 @@ import Resource from './resource';
 import { attr, hasOne, hasMany } from 'ember-jsonapi-resources/models/resource';
 
 export default Resource.extend({
- type: 'post',
+ type: 'posts',
  service: Ember.inject.service('posts'),
 
  title: attr('string'),

tests/dummy/app/models/supervisor.js

@@ -0,0 +1,7 @@
+import EmployeeResource from './person';
+import { hasMany } from 'ember-jsonapi-resources/models/resource';
+
+export default EmployeeResource.extend({
+ type: 'supervisors',
+ directReports: hasMany('employees')
+});

tests/dummy/config/environment.js

@@ -22,6 +22,7 @@ module.exports = function(environment) {
  API_PATH: 'api/v1',
  },
  contentSecurityPolicy: {
+ 'script-src': "'self' 'unsafe-inline' 'unsafe-eval' localhost:49152",
  'connect-src': "'self' api.pixelhandler.com localhost:3000 0.0.0.0:3000",
  'img-src': "'self' www.gravatar.com"
  }

tests/helpers/resources.js

@@ -1,51 +1,24 @@
-import Resource from 'ember-jsonapi-resources/models/resource';
-import { attr, hasOne, hasMany } from 'ember-jsonapi-resources/models/resource';
 import Ember from 'ember';
 import RSVP from 'rsvp';
 
-export const Post = Resource.extend({
- type: 'posts',
- title: attr('string'),
- excerpt: attr('string'),
- "updated-at": attr('date'),
- "created-at": attr('date'),
- author: hasOne('author'),
- comments: hasMany('comments')
-});
+import PostResource from 'dummy/models/post';
+import AuthorResource from 'dummy/models/author';
+import CommentResource from 'dummy/models/comment';
+import CommenterResource from 'dummy/models/commenter';
+import PersonResource from 'dummy/models/person';
+import EmployeeResource from 'dummy/models/employee';
+import SupervisorResource from 'dummy/models/supervisor';
+// Even though unused, keep PictureResource here for clarity. (shut up jshint!)
+import PictureResource from 'dummy/models/picture'; // jshint ignore:line
 
-export const Author = Resource.extend({
- type: 'authors',
- name: attr('string'),
- posts: hasMany('posts')
-});
-
-export const Comment = Resource.extend({
- type: 'comments',
- body: attr('string'),
- commenter: hasOne('commenter'),
- post: hasOne('post')
-});
-
-export const Commenter = Resource.extend({
- type: 'commenters',
- name: attr('string'),
- comments: hasMany('comments')
-});
-
-export const Person = Resource.extend({
- type: 'people',
- name: attr() // can use any value type for an attribute
-});
-
-export const Employee = Person.extend({
- type: 'employees',
- supervisor: hasOne({ resource: 'supervisor', type: 'people' })
-});
-
-export const Supervisor = Employee.extend({
- type: 'supervisors',
- directReports: hasMany({ resource: 'employees', type: 'people' })
-});
+// Remove the service from resources. We're using mock services.
+export const Post = PostResource.extend({service: null});
+export const Author = AuthorResource.extend({service: null});
+export const Comment = CommentResource.extend({service: null});
+export const Commenter = CommenterResource.extend({service: null});
+export const Person = PersonResource.extend({service: null});
+export const Employee = EmployeeResource.extend({service: null});
+export const Supervisor = SupervisorResource.extend({service: null});
 
 export function setup() {
  let opts = { instantiate: false, singleton: false };