mirage/dependency: Replace crate and version properties with relationships

Author: Turbo87

mirage/factories/dependency.js

@@ -3,13 +3,19 @@ import { Factory } from 'ember-cli-mirage';
 const REQS = ['^0.1.0', '^2.1.3', '0.3.7', '~5.2.12'];
 
 export default Factory.extend({
-  // crate_id,
-  // version_id,
-
   default_features: i => i % 4 === 3,
   features: () => [],
   kind: i => (i % 3 === 0 ? 'dev' : 'normal'),
   optional: i => i % 4 !== 3,
   req: i => REQS[i % REQS.length],
   target: null,
+
+  afterCreate(self) {
+    if (!self.crateId) {
+      throw new Error(`Missing \`crate\` relationship on \`dependency:${self.id}\``);
+    }
+    if (!self.versionId) {
+      throw new Error(`Missing \`version\` relationship on \`dependency:${self.id}\``);
+    }
+  },
 });

mirage/fixtures/crates.js

@@ -395,4 +395,36 @@ export default [
     updated_at: '2015-11-22T22:00:41Z',
     versions: null,
   },
+  {
+    id: 'libc',
+    name: 'libc',
+    max_version: '1.0.1',
+    newest_version: '1.0.1',
+    downloads: 5169,
+    recent_downloads: 69,
+  },
+  {
+    id: 'nanomsg-sys',
+    name: 'nanomsg-sys',
+    max_version: '1.0.1',
+    newest_version: '1.0.1',
+    downloads: 5169,
+    recent_downloads: 69,
+  },
+  {
+    id: 'mock-build-deps',
+    name: 'mock-build-deps',
+    max_version: '1.0.1',
+    newest_version: '1.0.1',
+    downloads: 5169,
+    recent_downloads: 69,
+  },
+  {
+    id: 'mock-dev-deps',
+    name: 'mock-dev-deps',
+    max_version: '1.0.1',
+    newest_version: '1.0.1',
+    downloads: 5169,
+    recent_downloads: 69,
+  },
 ];

mirage/fixtures/dependencies.js

@@ -1,57 +1,57 @@
 export default [
   {
-    crate_id: 'libc',
+    crateId: 'libc',
     default_features: true,
     features: '',
     id: 146231,
     kind: 'normal',
     optional: false,
     req: '^0.2.18',
     target: null,
-    version_id: 40905,
+    versionId: 40905,
   },
   {
-    crate_id: 'nanomsg-sys',
+    crateId: 'nanomsg-sys',
     default_features: true,
     features: '',
     id: 146232,
     kind: 'normal',
     optional: false,
     req: '^0.6.1',
     target: null,
-    version_id: 40905,
+    versionId: 40905,
   },
   {
-    crate_id: 'nanomsg',
+    crateId: 'nanomsg',
     default_features: true,
     features: '',
     id: 146233,
     kind: 'normal',
     optional: false,
     req: '^0.5.0',
     target: null,
-    version_id: 28674,
+    versionId: 28674,
   },
   {
-    crate_id: 'mock-build-deps',
+    crateId: 'mock-build-deps',
     default_features: true,
     features: '',
     id: 146234,
     kind: 'build',
     optional: false,
     req: '^0.6.1',
     target: null,
-    version_id: 40905,
+    versionId: 40905,
   },
   {
-    crate_id: 'mock-dev-deps',
+    crateId: 'mock-dev-deps',
     default_features: true,
     features: '',
     id: 146235,
     kind: 'dev',
     optional: true,
     req: '^0.6.1',
     target: null,
-    version_id: 40905,
+    versionId: 40905,
   },
 ];

mirage/models/dependency.js

@@ -1,3 +1,6 @@
-import { Model } from 'ember-cli-mirage';
+import { Model, belongsTo } from 'ember-cli-mirage';
 
-export default Model.extend({});
+export default Model.extend({
+  crate: belongsTo(),
+  version: belongsTo(),
+});

mirage/route-handlers/crates.js

@@ -85,7 +85,7 @@ export function register(server) {
     let version = schema.versions.findBy({ crateId, num });
     if (!version) return { errors: [{ detail: `crate \`${crateId}\` does not have a version \`${num}\`` }] };
 
-    return schema.dependencies.where({ version_id: version.id });
+    return schema.dependencies.where({ versionId: version.id });
   });
 
   server.get('/api/v1/crates/:crate_id/:version_num/downloads', function(schema, request) {
@@ -139,11 +139,11 @@ export function register(server) {
 
     let { start, end } = pageParams(request);
 
-    let allDependencies = schema.dependencies.where({ crate_id: crateId });
+    let allDependencies = schema.dependencies.where({ crateId: crateId });
     let dependencies = allDependencies.slice(start, end);
     let total = allDependencies.length;
 
-    let versions = schema.versions.find(dependencies.models.map(it => it.version_id));
+    let versions = schema.versions.find(dependencies.models.map(it => it.versionId));
 
     return {
       ...this.serialize(dependencies),

tests/acceptance/front-page-test.js

@@ -32,8 +32,8 @@ module('Acceptance | front page', function(hooks) {
     assert.dom('[data-test-all-crates-link]').exists();
     assert.dom('[data-test-login-link]').exists();
 
-    assert.dom('[data-test-total-downloads]').hasText('122,669');
-    assert.dom('[data-test-total-crates]').hasText('19');
+    assert.dom('[data-test-total-downloads]').hasText('143,345');
+    assert.dom('[data-test-total-crates]').hasText('23');
 
     assert.dom('[data-test-new-crates] [data-test-crate-link="0"]').hasText('Inflector (0.1.6)');
     assert.dom('[data-test-new-crates] [data-test-crate-link="0"]').hasAttribute('href', '/crates/Inflector/0.1.6');

tests/mirage/crates-test.js

@@ -501,9 +501,13 @@ module('Mirage | Keywords', function(hooks) {
     test('returns a list of dependencies belonging to the specified crate version', async function(assert) {
       this.server.create('crate', { name: 'rand' });
       let version = this.server.create('version', { crateId: 'rand', num: '1.0.0' });
-      this.server.create('dependency', { crate_id: 'foo', version_id: version.id });
-      this.server.create('dependency', { crate_id: 'bar', version_id: version.id });
-      this.server.create('dependency', { crate_id: 'baz', version_id: version.id });
+
+      this.server.create('crate', { name: 'foo' });
+      this.server.create('dependency', { crateId: 'foo', versionId: version.id });
+      this.server.create('crate', { name: 'bar' });
+      this.server.create('dependency', { crateId: 'bar', versionId: version.id });
+      this.server.create('crate', { name: 'baz' });
+      this.server.create('dependency', { crateId: 'baz', versionId: version.id });
 
       let response = await fetch('/api/v1/crates/rand/1.0.0/dependencies');
       assert.equal(response.status, 200);
@@ -733,15 +737,15 @@ module('Mirage | Keywords', function(hooks) {
       this.server.create('crate', { name: 'foo' });
 
       this.server.create('dependency', {
-        crate_id: 'foo',
-        version_id: this.server.create('version', {
+        crateId: 'foo',
+        versionId: this.server.create('version', {
           crate: this.server.create('crate', { name: 'bar' }),
         }).id,
       });
 
       this.server.create('dependency', {
-        crate_id: 'foo',
-        version_id: this.server.create('version', {
+        crateId: 'foo',
+        versionId: this.server.create('version', {
           crate: this.server.create('crate', { name: 'baz' }),
         }).id,
       });
@@ -821,8 +825,8 @@ module('Mirage | Keywords', function(hooks) {
       this.server.create('crate', { name: 'foo' });
 
       this.server.createList('dependency', 25, {
-        crate_id: 'foo',
-        version_id: () =>
+        crateId: 'foo',
+        versionId: () =>
           this.server.create('version', {
             crate: () => this.server.create('crate', { name: 'bar' }),
           }).id,
@@ -847,8 +851,8 @@ module('Mirage | Keywords', function(hooks) {
         crate: i => crates[i],
       });
       this.server.createList('dependency', versions.length, {
-        crate_id: 'foo',
-        version_id: i => versions[i].id,
+        crateId: 'foo',
+        versionId: i => versions[i].id,
       });
 
       let response = await fetch('/api/v1/crates/foo/reverse_dependencies?page=2&per_page=5');