Merge pull request #4630 from runspired/json-api-mock-server

Updates json-api-mock-server

package.json

@@ -81,18 +81,19 @@
     "ember-resolver": "^2.0.3",
     "ember-watson": "^0.7.0",
     "express": "^4.14.0",
+    "faker": "^3.1.0",
     "github": "^0.2.4",
     "glob": "5.0.13",
     "heimdall-query": "^0.0.5",
-    "json-api-mock-server": "0.0.2",
+    "json-api-mock-server": "0.1.1",
+    "loader.js": "^4.0.1",
     "mocha": "2.4.5",
     "mocha-only-detector": "0.0.2",
-    "phantomjs-prebuilt": "^2.1.12",
     "morgan": "^1.7.0",
+    "phantomjs-prebuilt": "^2.1.12",
     "pretender": "1.0.0",
     "rimraf": "2.5.2",
-    "rsvp": "3.2.1",
-    "loader.js": "^4.0.1"
+    "rsvp": "3.2.1"
   },
   "peerDependencies": {
     "ember-inflector": "^1.9.4"

server/models/baz.js

@@ -0,0 +1,12 @@
+var faker = require('faker');
+var props = require('../store/props');
+var attr = props.attr;
+var one = props.one;
+var between = require('../utils/between');
+
+module.exports = {
+  name: attr('string', { defaultValue: function() { return faker.lorem.words(between(3, 7)); }}),
+  description: attr('string', { defaultValue: function() { return faker.lorem.sentences(between(3, 7)); }}),
+  complex: one('complex', { inverse: 'baz', defaultValue: false }),
+  heavyBaz: one('heavy-baz', { inverse: 'bazs', defaultValue: false })
+};

server/models/complex.js

@@ -0,0 +1,13 @@
+var faker = require('faker');
+var props = require('../store/props');
+var attr = props.attr;
+var many = props.many;
+var one = props.one;
+var between = require('../utils/between');
+
+module.exports = {
+  name: attr('string', { defaultValue: function() { return faker.lorem.words(between(3, 7)); }}),
+  description: attr('string', { defaultValue: function() { return faker.lorem.sentences(between(3, 7)); }}),
+  baz: one('baz', { inverse: 'complex', defaultValue: true }),
+  foos: many('foo', { inverse: 'complex', defaultValue: 5 })
+};

server/models/foo.js

@@ -0,0 +1,12 @@
+var faker = require('faker');
+var props = require('../store/props');
+var attr = props.attr;
+var one = props.one;
+var between = require('../utils/between');
+
+module.exports = {
+  name: attr('string', { defaultValue: function() { return faker.lorem.words(between(3, 7)); }}),
+  description: attr('string', { defaultValue: function() { return faker.lorem.sentences(between(3, 7)); }}),
+  complex: one('complex', { inverse: 'foos', defaultValue: false }),
+  heavyFoo: one('heavy-foo', { inverse: 'foo', defaultValue: false })
+};

server/models/heavy-baz.js

@@ -0,0 +1,13 @@
+var faker = require('faker');
+var props = require('../store/props');
+var attr = props.attr;
+var one = props.one;
+var many = props.many;
+var between = require('../utils/between');
+
+module.exports = {
+  name: attr('string', { defaultValue: function() { return faker.lorem.words(between(3, 7)); }}),
+  description: attr('string', { defaultValue: function() { return faker.lorem.sentences(between(3, 7)); }}),
+  heavy: one('heavy', { inverse: 'heavyBaz', defaultValue: false }),
+  bazs: many('baz', { inverse: 'heavyBaz', defaultValue: 5 })
+};

server/models/heavy-foo.js

@@ -0,0 +1,12 @@
+var faker = require('faker');
+var props = require('../store/props');
+var attr = props.attr;
+var one = props.one;
+var between = require('../utils/between');
+
+module.exports = {
+  name: attr('string', { defaultValue: function() { return faker.lorem.words(between(3, 7)); }}),
+  description: attr('string', { defaultValue: function() { return faker.lorem.sentences(between(3, 7)); }}),
+  heavy: one('heavy', { inverse: 'heavyFoos', defaultValue: false }),
+  foo: one('foo', { inverse: 'heavyFoo', defaultValue: true })
+};

server/models/heavy.js

@@ -0,0 +1,13 @@
+var faker = require('faker');
+var props = require('../store/props');
+var attr = props.attr;
+var many = props.many;
+var one = props.one;
+var between = require('../utils/between');
+
+module.exports = {
+  name: attr('string', { defaultValue: function() { return faker.lorem.words(between(3, 7)); }}),
+  description: attr('string', { defaultValue: function() { return faker.lorem.sentences(between(3, 7)); }}),
+  heavyBaz: one('heavy-baz', { inverse: 'heavy', defaultValue: true }),
+  heavyFoos: many('heavy-foo', { inverse: 'heavy', defaultValue: 5 })
+};

server/models/simple.js

@@ -0,0 +1,9 @@
+var faker = require('faker');
+var props = require('../store/props');
+var attr = props.attr;
+var between = require('../utils/between');
+
+module.exports = {
+  title: attr('string', { defaultValue: function() { return faker.lorem.words(between(3, 7)); }}),
+  description: attr('string', { defaultValue: function() { return faker.lorem.sentences(between(3, 7)); }})
+};

server/scenarios/default.js

@@ -0,0 +1,6 @@
+module.exports = function(store) {
+  store.seed('simple', 240);
+  store.seed('complex', 35);
+  store.seed('heavy', 14);
+};
+

tests/dummy/app/routes/query/route.js

@@ -1,15 +1,10 @@
 /* global window, heimdall, console */
 import Ember from 'ember';
-import instrumentBaseObjects from '../../helpers/reopen-instrumentation';
-import config from 'dummy/config/environment';
 
 const {
-  getOwner,
   Route
 } = Ember;
 
-let HAS_INSTRUMENTED = false;
-
 export default Route.extend({
 
   queryParams: {
@@ -23,11 +18,6 @@ export default Route.extend({
 
   model(params) {
     // switch this to 'production' when generating production build baselines
-    if (config.environment === 'development' && !HAS_INSTRUMENTED) {
-      instrumentBaseObjects(getOwner(this));
-      HAS_INSTRUMENTED = true;
-    }
-
     let modelName = params.modelName;
     delete params.modelName;