Skip to content

Commit be1d985

Browse files
committed
mirage/crate: Replace _owner_users property with userOwners relationship
1 parent 1f917ad commit be1d985

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

mirage/factories/crate.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,4 @@ export default Factory.extend({
2525
badges: () => [],
2626
_extra_downloads: () => [],
2727
_owner_teams: () => [],
28-
_owner_users: () => [],
2928
});

mirage/fixtures/crates.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default [
5858
},
5959
],
6060
_owner_teams: [1, 303],
61-
_owner_users: [2, 303],
61+
userOwnerIds: [2, 303],
6262
},
6363
{
6464
created_at: '2015-02-27T11:52:13Z',

mirage/models/crate.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ export default Model.extend({
44
categories: hasMany(),
55
keywords: hasMany(),
66
versions: hasMany(),
7+
userOwners: hasMany('user'),
78
});

mirage/route-handlers/crates.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ export function register(server) {
9999
let crate = schema.crates.find(crateId);
100100
if (!crate) return notFound();
101101

102-
let users = schema.users.find(crate._owner_users);
103-
104-
let response = this.serialize(users);
102+
let response = this.serialize(crate.userOwners);
105103

106104
response.users.forEach(user => {
107105
user.kind = 'user';

mirage/serializers/crate.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,7 @@ export default BaseSerializer.extend({
5454

5555
hash.versions = hash.version_ids;
5656
delete hash.version_ids;
57+
58+
delete hash.user_owner_ids;
5759
},
5860
});

tests/mirage/crates-test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ module('Mirage | Keywords', function(hooks) {
646646

647647
test('returns the list of users that own the specified crate', async function(assert) {
648648
let user = this.server.create('user', { name: 'John Doe' });
649-
this.server.create('crate', { name: 'rand', _owner_users: [user.id] });
649+
this.server.create('crate', { name: 'rand', userOwners: [user] });
650650

651651
let response = await fetch('/api/v1/crates/rand/owner_user');
652652
assert.equal(response.status, 200);

0 commit comments

Comments
 (0)