Skip to content

Commit e2ce741

Browse files
committed
Upgrade ember-cli-mirage
1 parent 3e48455 commit e2ce741

17 files changed

Lines changed: 177 additions & 63 deletions

File tree

mirage/config.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ export default function() {}
1414
export function testConfig() {
1515

1616
this.get('/gists', function(schema) {
17-
return schema.db.gists;
17+
return schema.gists.all();
1818
});
1919

2020
this.get('/gists/:id', function(schema, request) {
2121
let id = request.params.id;
22-
return schema.db.gists.find(id);
22+
return schema.gists.find(id);
2323
});
2424

2525
this.get('/gists/:id/:rev_id', function(schema, request) {
2626
let id = request.params.id;
27-
return schema.db["gistRevisions"].find(id);
27+
return schema.gistRevisions.find(id);
2828
});
2929

3030
this.post('/gists', function(schema, request) {
@@ -49,7 +49,7 @@ export function testConfig() {
4949
});
5050

5151
this.get('/user', function(schema) {
52-
return schema.db.users.find(1);
52+
return schema.users.find(1);
5353
});
5454

5555
this.get(config.addonUrl, function(schema, request) {

mirage/factories/gist-file.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* This is a factory definition for a gist file
33
*/
4-
import Mirage/*, {faker} */ from 'ember-cli-mirage';
4+
import Mirage from 'ember-cli-mirage';
55

66
export default Mirage.Factory.extend({
77
type() {

mirage/factories/gist-revision.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ import GistFactory from './gist';
66
export default GistFactory.extend({
77
url() {
88
return `https://api.github.com/gists/${this.id}/${this.revId}`;
9-
}
9+
},
10+
owner: null,
11+
afterCreate() {}
1012
});
1113

1214
/* Sample

mirage/factories/gist.js

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* This is a factory definition for a gist.
33
*/
4-
import Mirage/*, {faker} */ from 'ember-cli-mirage';
4+
import Mirage from 'ember-cli-mirage';
55

66
export default Mirage.Factory.extend({
77
url() {
@@ -34,16 +34,17 @@ export default Mirage.Factory.extend({
3434
},
3535
//owner,
3636
forks: [],
37-
history() {
38-
return [
39-
{
40-
"user": null,
41-
"version": "921e8958fe32b5a1b724fa6754d0dd904cfa9e62",
42-
"committed_at": "2015-07-23T22:49:45Z",
43-
"url": `https://api.github.com/gists/${this.id}/921e8958fe32b5a1b724fa6754d0dd904cfa9e62`
44-
}
45-
];
46-
}
37+
//history,
38+
afterCreate(gist, server) {
39+
let historyEntry = server.create('gistRevision', {
40+
"user": null,
41+
"version": "921e8958fe32b5a1b724fa6754d0dd904cfa9e62",
42+
"committed_at": "2015-07-23T22:49:45Z",
43+
"url": `https://api.github.com/gists/${gist.id}/921e8958fe32b5a1b724fa6754d0dd904cfa9e62`
44+
});
45+
gist.update({ history: [historyEntry] });
46+
},
47+
//history
4748
});
4849

4950
/* Sample

mirage/factories/user.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* This is a factory definition for an owner
33
*/
4-
import Mirage/*, { faker } */ from 'ember-cli-mirage';
4+
import Mirage from 'ember-cli-mirage';
55

66
export default Mirage.Factory.extend({
77
avatar_url() {

mirage/models/gist-file.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { Model, belongsTo } from 'ember-cli-mirage';
2+
3+
export default Model.extend({
4+
gist: belongsTo()
5+
});

mirage/models/gist-revision.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { Model, belongsTo, hasMany } from 'ember-cli-mirage';
2+
3+
export default Model.extend({
4+
gist: belongsTo(),
5+
owner: belongsTo(),
6+
files: hasMany('gistFile')
7+
});

mirage/models/gist.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
import { Model, belongsTo, hasMany } from 'ember-cli-mirage';
2+
3+
export default Model.extend({
4+
user: belongsTo(),
5+
owner: belongsTo(),
6+
history: hasMany('gistRevision'),
7+
files: hasMany('gistFile')
8+
});

mirage/models/owner.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { Model, belongsTo } from 'ember-cli-mirage';
2+
3+
export default Model.extend({
4+
gist: belongsTo()
5+
});

mirage/models/user.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import { Model, belongsTo } from 'ember-cli-mirage';
2+
3+
export default Model.extend({
4+
gist: belongsTo()
5+
});

0 commit comments

Comments
 (0)