mirage/dependency: Ensure a dependency always has crate and version relationships

Author: Turbo87

mirage/factories/dependency.js

@@ -9,4 +9,13 @@ export default Factory.extend({
   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/route-handlers/crates.js

@@ -79,7 +79,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) {
@@ -129,11 +129,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/mirage/crates-test.js

@@ -504,9 +504,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);
@@ -736,15 +740,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,
       });
@@ -824,8 +828,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,
@@ -850,8 +854,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');